[FFmpeg-cvslog] Merge commit '678082b409aca711f9cf991df6b0200116489322'
Michael Niedermayer
git at videolan.org
Fri Mar 28 05:56:56 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 05:23:46 2014 +0100| [296e63efa56f1fb454cafb5c7f54dfb80cbfbab4] | committer: Michael Niedermayer
Merge commit '678082b409aca711f9cf991df6b0200116489322'
* commit '678082b409aca711f9cf991df6b0200116489322':
X-Bitmap decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c
See: a0340dfbd78df7639715056937011d2d414aaeed
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=296e63efa56f1fb454cafb5c7f54dfb80cbfbab4
---
More information about the ffmpeg-cvslog
mailing list