Michael Niedermayer 9818bbde53 Merge commit 'e0c53c3408' ... * commit 'e0c53c3408': nut: use meaningful error values FATE: use a less ambiguous end time for filter-trim-time test Conflicts: libavformat/nutdec.c tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-05-08 12:47:54 +02:00
..
fate	Merge commit 'e0c53c3408'	2013-05-08 12:47:54 +02:00
filtergraphs	fate: add bitexact flags to alphaextract/alphamerge tests.	2013-04-29 22:28:37 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2013-05-07 11:35:07 +02:00
audiogen.c	Merge commit '511cf612ac'	2012-12-21 17:32:52 +01:00
base64.c
copycooker.sh
fate-run.sh	fate/pixfmts: use the appropriate variable names for temporary files.	2013-05-01 13:25:42 +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	Merge commit 'b333f3a22a'	2013-05-03 11:41:48 +02:00
lena.pnm
Makefile	Merge commit '95e8ac60f8'	2013-05-05 10:36:23 +02: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