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 /cmdutils.h | |
| parent | 4105443872be75a8d1141facc43b54641304c722 (diff) | |
| parent | 2a11952f457658d58303c8e5b4e10fb4599eef4f (diff) | |
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 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/cmdutils.h b/cmdutils.h index 35015627d4..8348bf266a 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -154,13 +154,27 @@ void parse_options(int argc, char **argv, const OptionDef *options, /** * Filter out options for given codec. + * + * Create a new options dictionary containing only the options from + * opts which apply to the codec with ID codec_id. + * + * @param encoder if non-zero the codec is an encoder, otherwise is a decoder + * @return a pointer to the created dictionary */ AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, int encoder); -/* - * Setup AVCodecContext options for avformat_find_stream_info. +/** + * Setup AVCodecContext options for avformat_find_stream_info(). + * + * Create an array of dictionaries, one dictionary for each stream + * contained in s. + * Each dictionary will contain the options from codec_opts which can + * be applied to the corresponding stream codec context. + * + * @return pointer to the created array of dictionaries, NULL if it + * cannot be created */ -AVDictionary **setup_find_stream_info_opts(AVFormatContext *s); +AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts); /** * Print an error message to stderr, indicating filename and a human |