diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-29 01:50:43 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-29 01:50:53 +0200 |
commit | 2dd2abe391ccf1b9140c6eea95767b5a8c503ddd (patch) | |
tree | 0b3886285001ed05025bd4a338f3a5105d0c7a8b /libavformat | |
parent | 4105443872be75a8d1141facc43b54641304c722 (diff) | |
parent | 2a11952f457658d58303c8e5b4e10fb4599eef4f (diff) | |
download | ffmpeg-2dd2abe391ccf1b9140c6eea95767b5a8c503ddd.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
x86: cabac: don't load/store context values in asm
H.264: optimize CABAC x86 asm for Atom
vp3/theora: flush after seek.
doc/fftools-common-opts: wording fixes missing from the previous commit.
doc: document using AVOptions in fftools.
cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
cmdutils: clarify documentation for filter_codec_opts()
cmdutils: clarify documentation for setup_find_stream_info_opts()
lavf: add forgotten attribute_deprecated to av_find_stream_info()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avformat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7c041f6e80..029479152a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1188,6 +1188,7 @@ int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oforma * * @deprecated use avformat_find_stream_info. */ +attribute_deprecated int av_find_stream_info(AVFormatContext *ic); #endif |