[FFmpeg-cvslog] Fix compilation without --disable-swscale.

Carl Eugen Hoyos git at videolan.org
Sun Sep 18 19:07:49 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Sep 18 19:06:49 2011 +0200| [0ddcfa42cc7dae4c54ab9202bd7ed79980822f9c] | committer: Carl Eugen Hoyos

Fix compilation without --disable-swscale.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ddcfa42cc7dae4c54ab9202bd7ed79980822f9c
---

 cmdutils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 448edf5..f0f1464 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) {



More information about the ffmpeg-cvslog mailing list