diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-23 13:43:05 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-23 13:49:24 +0200 |
commit | 800ea20cadce7c5ec06e7821dc83dedb6e20209e (patch) | |
tree | d3400c82660ae2fa6f78776db2fec73aa1bd6ab2 /tests/ref/lavf/ismv | |
parent | c6f4a3a70837cf259466a7aab440dc0682b08c72 (diff) | |
parent | 30ce289074e88f528965cb57720674a675639737 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Make tkhd "enabled" flag QuickTime compatible
Conflicts:
libavformat/movenc.c
tests/ref/acodec/alac
tests/ref/acodec/pcm-s16be
tests/ref/acodec/pcm-s24be
tests/ref/acodec/pcm-s32be
tests/ref/acodec/pcm-s8
tests/ref/lavf/mov
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth1-prores
tests/ref/vsynth/vsynth1-qtrle
tests/ref/vsynth/vsynth1-svq1
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-svq1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/ismv')
-rw-r--r-- | tests/ref/lavf/ismv | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ref/lavf/ismv b/tests/ref/lavf/ismv index 05bb575ccd..458c4c1b56 100644 --- a/tests/ref/lavf/ismv +++ b/tests/ref/lavf/ismv @@ -1,9 +1,9 @@ -3a2563358cc91017fc96f9e690f26b85 *./tests/data/lavf/lavf.ismv +1efcfb3f09a9802ba63f6f592601281e *./tests/data/lavf/lavf.ismv 312255 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a -77dec1248e2c4d3b2b44dfe6bd27149a *./tests/data/lavf/lavf.ismv +95a3553714bb603f6b0e2bc0fc3fb319 *./tests/data/lavf/lavf.ismv 321181 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0xe8130120 -3a2563358cc91017fc96f9e690f26b85 *./tests/data/lavf/lavf.ismv +1efcfb3f09a9802ba63f6f592601281e *./tests/data/lavf/lavf.ismv 312255 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a |