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
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-06-10 13:08:48 -08:00
2015-04-23 23:56:21 -07:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2012-12-21 00:18:34 +01:00
2013-02-14 23:45:48 +01:00
2015-02-02 05:04:14 +01:00
2015-04-11 01:00:07 +02:00