summaryrefslogtreecommitdiff
path: root/libavformat/isom.h
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2016-11-03 18:52:08 -0400
committerVittorio Giovara <vittorio.giovara@gmail.com>2016-11-30 12:18:58 -0500
commit7010ebdf1ff7514fa505ff166fb60ce762a46b8b (patch)
tree8e16776f15246e58c04e5ee336fa1ac8bb189cab /libavformat/isom.h
parentc2f3af57a5af31ade6a3439b58d1d880ed004298 (diff)
downloadffmpeg-7010ebdf1ff7514fa505ff166fb60ce762a46b8b.tar.gz
mov: Evaluate the movie display matrix
This matrix needs to be applied after all others have (currently only display matrix from trak), but cannot be handled in movie box, since streams are not allocated yet. So store it in main context, and apply it when appropriate, that is after parsing the tkhd one. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r--libavformat/isom.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h
index d6845029d1..02bfedd048 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -240,6 +240,7 @@ typedef struct MOVContext {
uint8_t *decryption_key;
int decryption_key_len;
int enable_drefs;
+ int32_t movie_display_matrix[3][3]; ///< display matrix from mvhd
} MOVContext;
int ff_mp4_read_descr_len(AVIOContext *pb);