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
audiogen.c	Merge remote-tracking branch 'qatar/master'	2013-07-26 11:12:11 +02:00
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	fate: fix dpx on big endian	2013-10-06 15:22:18 +02:00
lena.pnm
Makefile	Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'	2013-12-17 18:08:50 +01:00
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c	Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'	2013-10-16 12:07:02 +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
videogen.c