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> |
||
---|---|---|
.. | ||
fate | ||
filtergraphs | ||
ref | ||
audiogen.c | ||
base64.c | ||
copycooker.sh | ||
fate-run.sh | ||
fate-update.sh | ||
fate-valgrind.supp | ||
fate.sh | ||
ffserver-regression.sh | ||
ffserver.conf | ||
ffserver.regression.ref | ||
lavf-regression.sh | ||
lena.pnm | ||
Makefile | ||
md5.sh | ||
regression-funcs.sh | ||
rotozoom.c | ||
test.ffmeta | ||
tiny_psnr.c | ||
tiny_ssim.c | ||
utils.c | ||
videogen.c |