Michael Niedermayer d2d794f3aa Merge remote-tracking branch 'qatar/master' ... * qatar/master: fate: Explicitly specify the pixel format for the pngparser test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-12-19 03:18:07 +01:00
..
fate	Merge remote-tracking branch 'qatar/master'	2013-12-19 03:18:07 +01:00
filtergraphs	Merge commit '874838dc6589d978611c89a40694a5074f892a76'	2013-11-21 18:49:41 +01:00
ref	Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'	2013-12-17 18:55:15 +01:00
Makefile	Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'	2013-12-17 18:08:50 +01:00
audiogen.c	…
base64.c	…
copycooker.sh	…
fate-run.sh	avformat/framehash: add software version to framecrc/md5	2013-10-23 16:32:32 +02:00
fate-update.sh	…
fate-valgrind.supp	…
fate.sh	tests/fate: fix fate on branches different from origin/master	2013-10-29 21:53:59 +01:00
ffserver-regression.sh	…
ffserver.conf	…
ffserver.regression.ref	…
lavf-regression.sh	…
lena.pnm	…
md5.sh	…
regression-funcs.sh	…
rotozoom.c	…
test.ffmeta	…
tiny_psnr.c	…
tiny_ssim.c	…
utils.c	…
videogen.c	…