1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
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-05-23 22:36:02 +02:00
2015-04-07 22:50:07 +02:00
2015-03-06 21:35:00 +01:00
2015-02-26 02:06:10 +01:00
2015-03-26 03:10:27 +01:00
2015-06-14 15:09:33 +02:00
2015-05-26 19:54:41 +02:00
2015-05-31 19:04:52 +02:00
2015-05-31 10:10:16 +03:00
2015-01-30 09:33:49 +00:00
2015-06-07 21:55:46 +02:00
2014-12-20 00:17:43 +01:00
2015-05-27 21:48:47 +02:00
2015-04-23 12:56:31 +02:00
2015-02-01 20:00:10 +01:00
2015-06-22 10:47:29 +03:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00
2015-04-24 03:43:56 +02:00
2015-04-11 13:51:03 +02:00