diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-18 18:57:35 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-18 18:57:35 +0200 |
| commit | c76861723bb13784e287046e1e80ce4cdb789136 (patch) | |
| tree | b78798678172cd2dd950f2326fdee2efbe9a06f1 | |
| parent | 8e4c10003acc5c909e3f8a463995ffd428a41a58 (diff) | |
| download | ffmpeg-c76861723bb13784e287046e1e80ce4cdb789136.tar.gz | |
Fix compilation with --disable-swscale.
Fixes ticket #482.
| -rw-r--r-- | cmdutils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index f7b24f65bd..448edf53bf 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -311,7 +311,7 @@ int opt_default(const char *opt, const char *arg) const AVOption *oc, *of, *os; char opt_stripped[128]; const char *p; - const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc = sws_get_class(); + const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(); if (!(p = strchr(opt, ':'))) p = opt + strlen(opt); @@ -323,7 +323,9 @@ int opt_default(const char *opt, const char *arg) av_dict_set(&codec_opts, opt, arg, FLAGS(oc)); if ((of = av_opt_find(&fc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) av_dict_set(&format_opts, opt, arg, FLAGS(of)); +#if CONFIG_SWSCALE if ((os = av_opt_find(&sc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) { + const AVClass *sc = sws_get_class(); // XXX we only support sws_flags, not arbitrary sws options int ret = av_set_string3(sws_opts, opt, arg, 1, NULL); if (ret < 0) { @@ -331,6 +333,7 @@ int opt_default(const char *opt, const char *arg) return ret; } } +#endif if (oc || of || os) return 0; |