Michael Niedermayer 31f3c94760 Merge remote-tracking branch 'qatar/master' ... * 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>		2012-05-20 10:21:52 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-05-20 10:21:52 +02:00
ref	af_aresample: fix rounding that led to sample accumulation in the buffers.	2012-05-18 22:57:02 +02:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh
copycooker.sh
fate_config.sh.template
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2012-05-16 22:32:05 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-05-16 22:32:05 +02:00
lavfi-regression.sh
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2012-05-20 10:21:52 +02:00
md5.sh
regression-funcs.sh	fate: remove unused code from regressions-funcs.sh	2012-05-18 14:00:36 +01:00
rotozoom.c
tiny_psnr.c
utils.c
videogen.c