mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-12-04 09:44:28 +00:00
800ea20cad
* 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>
10 lines
420 B
Plaintext
10 lines
420 B
Plaintext
1efcfb3f09a9802ba63f6f592601281e *./tests/data/lavf/lavf.ismv
|
|
312255 ./tests/data/lavf/lavf.ismv
|
|
./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
|
|
95a3553714bb603f6b0e2bc0fc3fb319 *./tests/data/lavf/lavf.ismv
|
|
321181 ./tests/data/lavf/lavf.ismv
|
|
./tests/data/lavf/lavf.ismv CRC=0xe8130120
|
|
1efcfb3f09a9802ba63f6f592601281e *./tests/data/lavf/lavf.ismv
|
|
312255 ./tests/data/lavf/lavf.ismv
|
|
./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
|