[FFmpeg-cvslog] cmdutils: ignore sws_flags if swscale is not enabled

Michael Niedermayer git at videolan.org
Sun Jun 29 17:28:04 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 29 17:01:39 2014 +0200| [7f5d75f95b65eb8499f6bf65535ce18a7c38ec5f] | committer: Michael Niedermayer

cmdutils: ignore sws_flags if swscale is not enabled

This avoids some failures during fate when swscale is disabled

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 cmdutils.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmdutils.c b/cmdutils.c
index eb60ac4..67bb66e 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -555,6 +555,11 @@ int opt_default(void *optctx, const char *opt, const char *arg)
         }
         consumed = 1;
     }
+#else
+    if (!consumed && !strcmp(opt, "sws_flags")) {
+        av_log(NULL, AV_LOG_WARNING, "Ignoring %s %s, due to disabled swscale\n", opt, arg);
+        consumed = 1;
+    }
 #endif
 #if CONFIG_SWRESAMPLE
     swr_class = swr_get_class();



More information about the ffmpeg-cvslog mailing list