Michael Niedermayer 4cb59ad84b Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9' ... * commit '3eec1d41b4a947ba497f528e68da14a8befb85b9': fate: Reuse VREF and AREF variables where appropriate Conflicts: tests/fate/filter.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-04-19 22:55:21 +02:00
..
fate	Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'	2013-04-19 22:55:21 +02:00
filtergraphs	Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'	2013-04-11 02:10:12 +02:00
ref	lavf/gif: correct the delay after the first frame.	2013-04-19 12:02:19 +02:00
audiogen.c	Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'	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
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
lavfi-regression.sh	lavfi/aspect: switch to an AVOptions-based system.	2013-04-11 22:05:03 +02:00
lena.pnm
Makefile	Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'	2013-04-19 22:55:21 +02:00
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
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