diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-14 20:44:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-14 20:44:58 +0200 |
| commit | 5dc6bd86f0f5cfffb44b47e6e916119f26b12091 (patch) | |
| tree | 968252b8209375cdca411921e37bd6c9db66b487 /cmdutils.h | |
| parent | 1885824b20a493d25db4b8e5397666e3a68f45f2 (diff) | |
| parent | 6cb11979295ae5d3b9bad0965cbd6a06d9c9783b (diff) | |
| download | ffmpeg-5dc6bd86f0f5cfffb44b47e6e916119f26b12091.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
APIchanges: fill in missing hashes and dates.
Add an APIChanges entry and bump minor versions for recent changes.
ffmpeg: print the low bitrate warning after the codec is openend.
doxygen: Move function documentation into the macro generating the function.
doxygen: Make sure parameter names match between .c and .h files.
h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
H.264: Add more x86 assembly for 10-bit H.264 predict functions
lavf: fix invalid reads in avformat_find_stream_info()
cmdutils: replace opt_default with opt_default2() and remove set_context_opts
ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
ffplay: use new avcodec_open2 and avformat_find_stream_info API.
cmdutils: store all codec options in one dict instead of video/audio/sub
ffmpeg: check experimental flag after codec is opened.
ffmpeg: do not set GLOBAL_HEADER flag in the options context
Conflicts:
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/version.h
libavformat/version.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cmdutils.h b/cmdutils.h index b05828cd0a..35015627d4 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -43,11 +43,10 @@ extern const char program_name[]; */ extern const int program_birth_year; -extern const char **opt_names; extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB]; extern AVFormatContext *avformat_opts; extern struct SwsContext *sws_opts; -extern AVDictionary *format_opts, *video_opts, *audio_opts, *sub_opts; +extern AVDictionary *format_opts, *codec_opts; /** * Initialize the cmdutils option system, in particular @@ -153,7 +152,15 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int void parse_options(int argc, char **argv, const OptionDef *options, int (* parse_arg_function)(const char *opt, const char *arg)); -void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec); +/** + * Filter out options for given codec. + */ +AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, int encoder); + +/* + * Setup AVCodecContext options for avformat_find_stream_info. + */ +AVDictionary **setup_find_stream_info_opts(AVFormatContext *s); /** * Print an error message to stderr, indicating filename and a human |