diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-10-24 17:46:47 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-01 12:19:00 -0400 |
| commit | ecd2ec69ce10e13f6ede353d2def7ce9f45c1a7d (patch) | |
| tree | c8a6e37b50a9ad68c4ebe319a440eb9314e6c963 /libavformat/isom.h | |
| parent | b90c8a3d08e3f9ad4de1253376d2d1d93abb8b8c (diff) | |
| download | ffmpeg-ecd2ec69ce10e13f6ede353d2def7ce9f45c1a7d.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.
Fate tests are updated accordingly.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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 58f0a20062..1aa2091043 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -167,6 +167,8 @@ typedef struct MOVContext { int export_all; int export_xmp; int enable_drefs; + + int32_t movie_display_matrix[3][3]; ///< display matrix from mvhd } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); |