aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-29 17:01:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-29 17:27:23 +0200
commit7f5d75f95b65eb8499f6bf65535ce18a7c38ec5f (patch)
tree147db17426e58b29a74995a6bf5965df361d555e
parent3f42434600f277598556cda981dc0492ec151bdf (diff)
downloadffmpeg-7f5d75f95b65eb8499f6bf65535ce18a7c38ec5f.tar.gz
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@gmx.at>
-rw-r--r--cmdutils.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c
index eb60ac487e..67bb66e9b5 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();