Michael Niedermayer 3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' ... * commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876': lavfi: add trim and atrim filters. Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-05-01 11:34:34 +02:00
..
fate	Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'	2013-05-01 11:34:34 +02:00
filtergraphs	fate: add bitexact flags to alphaextract/alphamerge tests.	2013-04-29 22:28:37 +02:00
ref	Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'	2013-05-01 11:34:34 +02:00
audiogen.c	Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'	2012-12-21 17:32:52 +01:00
base64.c
copycooker.sh
fate-run.sh	fate: port remaining filters to new system.	2013-04-30 02:12:45 +02: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	fate/gif: create meaningful gif encoding tests.	2013-04-19 02:05:01 +02:00
lena.pnm
Makefile	fate: port remaining filters to new system.	2013-04-30 02:12:45 +02:00
md5.sh	Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'	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 '3dc06b6972cf389269e9c36ff0a4373f80f7149b'	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