From 8c8eab8bfed74cceb4a04f982f349c7c17f5eb6f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 10 Jul 2011 15:46:15 +0200 Subject: cmdutils: store all codec options in one dict instead of video/audio/sub Split them when codec id is known. --- cmdutils.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cmdutils.h') diff --git a/cmdutils.h b/cmdutils.h index 02fcea4426..c581160318 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -43,7 +43,7 @@ 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 @@ -151,6 +151,11 @@ void parse_options(int argc, char **argv, const OptionDef *options, 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); + /** * Print an error message to stderr, indicating filename and a human * readable description of the error code err. -- cgit v1.2.3 From 3009f521f390b2bd440d9747a9c6baf648b2087a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 25 May 2011 16:59:51 +0200 Subject: ffplay: use new avcodec_open2 and avformat_find_stream_info API. --- cmdutils.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cmdutils.h') diff --git a/cmdutils.h b/cmdutils.h index c581160318..ae512b0f1a 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -156,6 +156,11 @@ void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *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 * readable description of the error code err. -- cgit v1.2.3 From 35d2e4e5c395bdb5b581e9caede63c7fc7a36138 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 25 May 2011 17:30:23 +0200 Subject: cmdutils: replace opt_default with opt_default2() and remove set_context_opts --- cmdutils.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'cmdutils.h') diff --git a/cmdutils.h b/cmdutils.h index ae512b0f1a..a47f15785d 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -39,7 +39,6 @@ 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; @@ -149,8 +148,6 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int void parse_options(int argc, char **argv, const OptionDef *options, void (* parse_arg_function)(const char*)); -void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec); - /** * Filter out options for given codec. */ -- cgit v1.2.3