[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sun Nov 20 03:03:19 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 20 02:46:06 2011 +0100| [dbb38bc389e1af5ed465ed370887d6af4da0cb40] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Fix stack alignment for SSE
avcodec: move some AVCodecContext fields to an internal struct.
avcodec: use av_opt_set() instead of deprecated av_set_string3()
avcodec: fix some const warnings
avcodec: remove pointless AVOption, internal_buffer_count
imgutils: Fix illegal read.
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=dbb38bc389e1af5ed465ed370887d6af4da0cb40
---
More information about the ffmpeg-cvslog
mailing list