mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +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>
5 lines
267 B
Plaintext
5 lines
267 B
Plaintext
c1c71cf2dbd6e332aacb6ab1c6affa59 *tests/data/fate/vsynth2-prores_ks.mov
|
|
3884596 tests/data/fate/vsynth2-prores_ks.mov
|
|
ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores_ks.out.rawvideo
|
|
stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200
|