[FFmpeg-cvslog] Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'
Michael Niedermayer
git at videolan.org
Sat Dec 27 12:52:26 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 27 12:41:10 2014 +0100| [d16079abf473b51be7686d20f8014bb48a095722] | committer: Michael Niedermayer
Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'
* commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1':
avcodec: add AVCodecContext.sw_pix_fmt
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d16079abf473b51be7686d20f8014bb48a095722
---
More information about the ffmpeg-cvslog
mailing list