ffmpeg/tests
Michael Niedermayer ff68b83968 Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 23:34:56 +02:00
..
fate Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2' 2015-06-22 23:34:56 +02:00
filtergraphs
ref Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2' 2015-06-22 23:34:56 +02:00
Makefile
audiogen.c
base64.c
copycooker.sh
fate-run.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
md5.sh
reference.pnm
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
tiny_ssim.c
utils.c
videogen.c