Michael Niedermayer 3ead79eaa3 Merge remote-tracking branch 'qatar/master' ... * qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt Conflicts: Changelog Makefile cmdutils.c configure doc/APIchanges ffmpeg.c tests/lavf-regression.sh tests/ref/lavf/dv_fmt tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-25 23:17:41 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-04-25 23:17:41 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2012-04-25 23:17:41 +02:00
asynth1.sw
audiogen.c	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
base64.c
codec-regression.sh	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
copycooker.sh
fate_config.sh.template
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2012-04-19 21:23:52 +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-04-25 23:17:41 +02:00
lavfi-regression.sh
lena.pnm
Makefile	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
md5.sh
regression-funcs.sh	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
rotozoom.c
tiny_psnr.c
videogen.c