[FFmpeg-cvslog] Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
Michael Niedermayer
git at videolan.org
Tue Jun 23 00:57:51 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 22 23:24:10 2015 +0200| [ff68b83968cba999a15b7c981c1bbcc2d608cad2] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff68b83968cba999a15b7c981c1bbcc2d608cad2
---
More information about the ffmpeg-cvslog
mailing list