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

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

fate: Test pullup and fieldmatch with 5 instead of 1 frame

2015-05-12 12:29:47 +02:00

fate-valgrind.supp

…

fate.sh

fate: Include branch information in the payload header

2015-04-12 18:02:23 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

tests/fate: added mxf opatom audio regression tests

2015-04-13 02:08:46 +02:00

Makefile

fate: add mp3 gapless test

2015-04-16 23:05:47 +02:00

md5.sh

…

reference.pnm

Replace lena.pnm

2014-11-28 17:55:27 -05:00

regression-funcs.sh

tests/regression-funcs: Remove hardcoded threads 1

2015-01-03 15:09:12 +01:00

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

tests/tiny_psnr: do not ignore errors from run_psnr

2015-04-23 15:39:36 +02:00

tiny_ssim.c

…

utils.c

tests/utils: Remove unneeded L suffix

2015-02-01 22:38:11 +01:00

videogen.c

…