diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:21:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:21:53 +0200 |
| commit | 07941c2cb28d6a80f628e035d61ab437d9719bf0 (patch) | |
| tree | 24cb5c00fde296dc99c8fcac6dfd8727a9e5dbf3 /libavformat/isom.h | |
| parent | ef1d4ee2f8b621a009d482d5b183a905bcb1cd74 (diff) | |
| parent | 853cc025d63ee2539fc0460dab62c5b9a3fd2043 (diff) | |
| download | ffmpeg-07941c2cb28d6a80f628e035d61ab437d9719bf0.tar.gz | |
Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'
* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043':
mov: store display matrix in a stream side data
Conflicts:
libavformat/isom.h
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
| -rw-r--r-- | libavformat/isom.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index a929ebf05e..a5934af4b9 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -145,6 +145,8 @@ typedef struct MOVStreamContext { int nb_frames_for_fps; int64_t duration_for_fps; + + int32_t *display_matrix; } MOVStreamContext; typedef struct MOVContext { |