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	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
audiogen.c	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
base64.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00
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	Add a --valgrind configure option.	2012-01-21 12:04:46 +01:00
fate.sh	fate: add support for specifying the shell used to run configure	2012-01-30 20:35:09 +01:00
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	Merge remote-tracking branch 'qatar/master'	2012-04-14 22:37:43 +02:00
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	tests/rotozoom: make some things const.	2012-03-15 21:52:11 +01:00
tiny_psnr.c	tiny_psnr: reindent after last commit.	2012-04-15 15:46:46 +02:00
videogen.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00