diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 13:46:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 14:10:21 +0200 |
| commit | be4cde226a2c7b1fe3864224d8a18f32b97edd45 (patch) | |
| tree | b83781e063fbbd5fe7106c17ff8d47a84c43e584 /cmdutils.c | |
| parent | c1d404b9e400d15b1b29fb05303278be0859eb7a (diff) | |
cmdutils: parse options for swr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cmdutils.c b/cmdutils.c index 58f08f6b3b..cd8b365abc 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -54,6 +54,7 @@ #endif struct SwsContext *sws_opts; +SwrContext *swr_opts; AVDictionary *format_opts, *codec_opts; const int this_year = 2012; @@ -66,6 +67,7 @@ void init_opts(void) sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL); #endif + swr_opts = swr_alloc(); } void uninit_opts(void) @@ -74,6 +76,7 @@ void uninit_opts(void) sws_freeContext(sws_opts); sws_opts = NULL; #endif + swr_free(&swr_opts); av_dict_free(&format_opts); av_dict_free(&codec_opts); } @@ -415,10 +418,10 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options) #define FLAGS(o) ((o)->type == AV_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0 int opt_default(const char *opt, const char *arg) { - const AVOption *oc, *of, *os; + const AVOption *oc, *of, *os, *oswr; char opt_stripped[128]; const char *p; - const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc; + const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc, *swr_class; if (!(p = strchr(opt, ':'))) p = opt + strlen(opt); @@ -444,8 +447,17 @@ int opt_default(const char *opt, const char *arg) } } #endif + swr_class = swr_get_class(); + if (!oc && !of && !os && (oswr = av_opt_find(&swr_class, opt, NULL, 0, + AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) { + int ret = av_opt_set(swr_opts, opt, arg, 0); + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "Error setting option %s.\n", opt); + return ret; + } + } - if (oc || of || os) + if (oc || of || os || oswr) return 0; av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt); return AVERROR_OPTION_NOT_FOUND; |