mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02: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>
13 lines
548 B
Plaintext
13 lines
548 B
Plaintext
65ba2cff95100a4914b2ff507eb42818 *./tests/data/lavf/lavf.mov
|
|
366421 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0xbb2b949b
|
|
b9b988b23b5e5aff8760d0475908f837 *./tests/data/lavf/lavf.mov
|
|
357511 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0xbb2b949b
|
|
5c5c79e09490763a2692c91c5985b7ea *./tests/data/lavf/lavf.mov
|
|
366593 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0xa9793231
|
|
c1d4ff07ccad169cb6fca003661f0c12 *./tests/data/lavf/lavf.mov
|
|
356893 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0xbb2b949b
|