mirror of https://git.ffmpeg.org/ffmpeg.git
* qatar/master: fate: fix dependencies on SAMPLES being set fate: remove unnecessary libavfilter dependency Conflicts: ffmpeg.c tests/Makefile tests/fate/aac.mak tests/fate/audio.mak tests/fate/demux.mak tests/fate/ea.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/mpc.mak tests/fate/probe.mak tests/fate/qt.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/vqf.mak tests/ref/fate/idroq-video-encode tests/ref/fate/vc1-ism Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
fate | ||
ref | ||
Makefile | ||
asynth1.sw | ||
audiogen.c | ||
base64.c | ||
codec-regression.sh | ||
copycooker.sh | ||
fate-run.sh | ||
fate-update.sh | ||
fate-valgrind.supp | ||
fate.sh | ||
fate_config.sh.template | ||
ffserver-regression.sh | ||
ffserver.conf | ||
ffserver.regression.ref | ||
lavf-regression.sh | ||
lavfi-regression.sh | ||
lena.pnm | ||
md5.sh | ||
regression-funcs.sh | ||
rotozoom.c | ||
tiny_psnr.c | ||
utils.c | ||
videogen.c |