Michael Niedermayer 37bdf33cff Merge remote-tracking branch 'qatar/master' ... * qatar/master: vmdav: convert to bytestream2 FATE: add a test for the join filter FATE: add a test for the volume filter Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-28 15:02:49 +01:00
..
fate	Merge remote-tracking branch 'qatar/master'	2013-03-28 15:02:49 +01:00
filtergraphs	FATE: add a test for the channelmap filter	2013-03-28 08:02:55 +01:00
ref	Merge commit '43a8333a16'	2013-03-28 14:29:01 +01:00
audiogen.c	Merge commit '511cf612ac'	2012-12-21 17:32:52 +01:00
base64.c
copycooker.sh
fate-run.sh	Merge commit '9146e872c6'	2013-01-22 14:09:59 +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	fate: test both direct and indirect paths in hue filter.	2013-03-16 16:17:44 +01:00
lena.pnm
Makefile	tools: add tiny_ssim	2013-03-26 17:31:41 +01:00
md5.sh	Merge commit '3dc06b6972'	2012-10-16 14:04:14 +02:00
regression-funcs.sh	fate: remove unused functions	2012-05-30 05:57:56 +02:00
rotozoom.c	Merge remote-tracking branch 'qatar/master'	2012-06-07 21:45:52 +02:00
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	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
videogen.c	Merge remote-tracking branch 'qatar/master'	2012-06-07 21:45:52 +02:00