[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
Michael Niedermayer
git at videolan.org
Mon Nov 21 19:59:19 CET 2011
ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 20 03:27:50 2011 +0100| [14d4eee547c9fb7a2593829201f139c754ad62ba] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
Add a version bump and APIchanges entry for avcodec_open2 and avformat_find_stream_info.
lavf: fix multiplication overflow in avformat_find_stream_info()
lavf: fix invalid reads in avformat_find_stream_info()
lavf: add avformat_find_stream_info()
lavc: fix parentheses placement in avcodec_open2().
lavc: introduce avcodec_open2() as a replacement for avcodec_open().
Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14d4eee547c9fb7a2593829201f139c754ad62ba
---
More information about the ffmpeg-cvslog
mailing list