ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff68b83968cba999a15b7c981c1bbcc2d608cad2
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
