Michael Niedermayer ebbd4fd5f0 Merge remote-tracking branch 'qatar/master' ... * qatar/master: FATE: add a test for the interlace filter lavfi: new interlace filter Conflicts: Changelog configure doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-04-12 16:32:33 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2013-04-12 16:32:33 +02:00
filtergraphs	Merge commit 'ba8efac977'	2013-04-11 02:10:12 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2013-04-12 16:32:33 +02:00
audiogen.c	Merge commit '511cf612ac'	2012-12-21 17:32:52 +01:00
base64.c
copycooker.sh
fate-run.sh	fate: Print correct error message for reference generation too	2013-03-30 11:41:58 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh	Merge remote-tracking branch 'qatar/master'	2012-09-06 16:23:17 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge commit '666fe5da47'	2013-03-12 21:34:24 +01:00
lavfi-regression.sh	lavfi/aspect: switch to an AVOptions-based system.	2013-04-11 22:05:03 +02:00
lena.pnm
Makefile	lavfi/aevalsrc: switch to an AVOptions-based system.	2013-04-11 17:28:02 +02:00
md5.sh	Merge commit '3dc06b6972'	2012-10-16 14:04:14 +02:00
regression-funcs.sh
rotozoom.c
test.ffmeta	fate/ffprobe: add some stream metadata.	2012-10-08 11:03:27 +02:00
tiny_psnr.c	Merge commit '3dc06b6972'	2012-10-16 14:04:14 +02:00
tiny_ssim.c	tests/tiny_ssim: include the 2 macros instead of a header	2013-03-27 01:38:18 +01:00
utils.c
videogen.c