diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 03:27:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 03:27:50 +0100 |
| commit | 14d4eee547c9fb7a2593829201f139c754ad62ba (patch) | |
| tree | 6c151861cd2d1730a134d1f1084b6bc244e9f930 /libavcodec/cabac.h | |
| parent | 64a854d06bb36bd417bdd1ea16567732dc890ad3 (diff) | |
| parent | 07624cfeaa8ea11d213032135fb56ffd5022b73a (diff) | |
| download | ffmpeg-14d4eee547c9fb7a2593829201f139c754ad62ba.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/cabac.h')
0 files changed, 0 insertions, 0 deletions