diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-18 19:06:49 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-18 19:06:49 +0200 |
| commit | 0ddcfa42cc7dae4c54ab9202bd7ed79980822f9c (patch) | |
| tree | 04e3a8334ab65ee21202800871f6d6e226d64e71 | |
| parent | c76861723bb13784e287046e1e80ce4cdb789136 (diff) | |
| download | ffmpeg-0ddcfa42cc7dae4c54ab9202bd7ed79980822f9c.tar.gz | |
Fix compilation without --disable-swscale.
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c index 448edf53bf..f0f1464ffa 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(); + const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc; if (!(p = strchr(opt, ':'))) p = opt + strlen(opt); @@ -324,8 +324,8 @@ int opt_default(const char *opt, const char *arg) 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 + sc = sws_get_class(); 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) { |