summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2016-10-24 17:46:47 -0400
committerVittorio Giovara <vittorio.giovara@gmail.com>2016-11-01 12:19:00 -0400
commitecd2ec69ce10e13f6ede353d2def7ce9f45c1a7d (patch)
treec8a6e37b50a9ad68c4ebe319a440eb9314e6c963 /tests
parentb90c8a3d08e3f9ad4de1253376d2d1d93abb8b8c (diff)
downloadffmpeg-streaming-ecd2ec69ce10e13f6ede353d2def7ce9f45c1a7d.zip
ffmpeg-streaming-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 'tests')
-rw-r--r--tests/ref/fate/mov-dar2
-rw-r--r--tests/ref/fate/mov-display-matrix2
-rw-r--r--tests/ref/fate/mov-sar2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/ref/fate/mov-dar b/tests/ref/fate/mov-dar
index 38a0ac4..9ca9a41 100644
--- a/tests/ref/fate/mov-dar
+++ b/tests/ref/fate/mov-dar
@@ -1 +1 @@
-3:1
+3:2
diff --git a/tests/ref/fate/mov-display-matrix b/tests/ref/fate/mov-display-matrix
index 64c9599..6498148 100644
--- a/tests/ref/fate/mov-display-matrix
+++ b/tests/ref/fate/mov-display-matrix
@@ -1,5 +1,5 @@
0
-65536
+131072
0
-65536
0
diff --git a/tests/ref/fate/mov-sar b/tests/ref/fate/mov-sar
index 9f303fc..291b047 100644
--- a/tests/ref/fate/mov-sar
+++ b/tests/ref/fate/mov-sar
@@ -1 +1 @@
-9:2
+9:4
OpenPOWER on IntegriCloud