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 /ffmpeg.c | |
| 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 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3388,7 +3388,7 @@ static int opt_input_file(const char *opt, const char *filename) } /* Set AVCodecContext options for avformat_find_stream_info */ - opts = setup_find_stream_info_opts(ic); + opts = setup_find_stream_info_opts(ic, codec_opts); orig_nb_streams = ic->nb_streams; /* If not enough info to get the stream parameters, we decode the |