ffmpeg | branch: release/2.8 | Michael Niedermayer <mich...@niedermayer.cc> | Sat Sep 19 21:23:11 2015 +0200| [2a6103a0820e99cf5ee1a368f3ae34838dc7e976] | committer: Michael Niedermayer
cmdutils: Filter dst/srcw/h Dimensions / pixel formats for scaling must be set through the -s / pix_fmt options or the scale / format filters. Otherwise there are mismatches between whet is in/output to the scaler and for what the scaler is configured Fixes Ticket4856 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit a0af9fd95415293b965bb67e56a11f6429326db1) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a6103a0820e99cf5ee1a368f3ae34838dc7e976 --- cmdutils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmdutils.c b/cmdutils.c index b696008..3543edd 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
