Michael Niedermayer 9818bbde53 Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' ... * commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe': 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 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'	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
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
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'	2013-05-03 11:41:48 +02:00
lena.pnm
Makefile	Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'	2013-05-05 10:36:23 +02:00
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
tiny_ssim.c
utils.c
videogen.c