X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmdutils.c;h=3543edd0cb36317152d43e837b043f27a54001d6;hb=b4ea8a7305214c0460e0ac951135aafcfa99d9e5;hp=b696008c879cf650f10e5c0dcf458052a1e6fc8f;hpb=ba42096d9acb73cc9b74685bf822a3180d96bab5;p=ffmpeg

diff --git a/cmdutils.c b/cmdutils.c
index b696008c879..3543edd0cb3 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -563,6 +563,12 @@ int opt_default(void *optctx, const char *opt, const char *arg)
         struct SwsContext *sws = sws_alloc_context();
         int ret = av_opt_set(sws, opt, arg, 0);
         sws_freeContext(sws);
+        if (!strcmp(opt, "srcw") || !strcmp(opt, "srch") ||
+            !strcmp(opt, "dstw") || !strcmp(opt, "dsth") ||
+            !strcmp(opt, "src_format") || !strcmp(opt, "dst_format")) {
+            av_log(NULL, AV_LOG_ERROR, "Directly using swscale dimensions/format options is not supported, please use the -s or -pix_fmt options\n");
+            return AVERROR(EINVAL);
+        }
         if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR, "Error setting option %s.\n", opt);
             return ret;