1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
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-06-04 23:10:56 +02:00
2015-06-14 15:09:33 +02:00
2015-04-29 20:13:59 +02:00
2015-05-06 17:50:09 +02:00
2015-05-28 16:10:56 +02:00
2015-06-06 16:02:19 +00:00
2015-05-28 01:01:16 +02:00
2015-06-19 13:57:36 +02:00
2015-06-08 19:11:27 +02:00
2015-05-31 15:03:31 +02:00
2015-05-25 16:08:08 +02:00
2015-05-31 15:03:31 +02:00
2015-05-20 15:50:58 +02:00
2015-06-17 20:11:43 +02:00
2015-06-22 15:23:08 +01:00
2015-05-13 00:41:38 +02:00
2015-05-31 15:03:31 +02:00