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-03-05 13:41:51 +01:00
2014-06-05 12:20:44 +02:00
2015-05-19 13:43:18 +02:00
2014-04-06 23:43:02 +02:00
2015-04-12 00:15:58 +02:00
2015-03-15 22:20:15 +01:00
2015-04-13 02:08:46 +02:00
2014-04-19 05:06:06 +02:00
2014-01-15 21:20:47 +01:00
2014-12-02 03:02:30 +01:00
2014-06-27 02:36:45 +02:00
2015-06-20 14:26:34 +02:00
2015-05-15 03:13:49 +02:00
2015-06-17 22:47:17 +02:00
2015-04-22 19:28:07 +02:00
2014-03-18 01:29:50 +01:00
2014-07-21 02:27:28 +02:00
2015-04-03 22:48:33 +02:00
2015-06-22 23:34:56 +02:00
2015-06-21 13:43:02 +02:00
2015-05-29 09:42:35 +03:00
2015-06-21 20:55:23 +02:00
2015-04-02 23:15:57 +02:00
2015-06-21 17:33:46 +02:00
2014-12-10 00:58:13 +01:00
2015-04-20 05:19:03 +02:00
2014-10-04 11:21:32 +02:00
2015-06-21 20:32:06 +02:00
2015-04-06 23:00:16 +02:00
2015-01-28 05:45:32 +01:00
2014-07-14 22:12:28 +03:00
2015-02-15 20:25:31 +01:00
2014-09-25 13:37:40 +02:00
2015-03-24 01:24:13 +01:00
2015-04-23 12:56:31 +02:00
2015-06-07 01:24:50 -03:00
2014-02-14 21:38:00 +01:00
2015-06-22 19:09:50 +02:00
2015-06-22 22:47:32 +02:00
2015-05-07 07:19:49 -04:00
2014-05-15 19:16:57 +02:00
2014-09-02 14:41:13 -07:00