From d3d776ccf94c988755efb264e318e97a11fea194 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Aug 2015 14:43:12 +0200 Subject: avfilter/vf_scale: apply generic options after flags. Otherwise the flags overwrite anything set by the generic stuff to the flags Signed-off-by: Michael Niedermayer --- libavfilter/vf_scale.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'libavfilter/vf_scale.c') diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index d4c0be26e4..ac2efe3a9b 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -356,15 +356,6 @@ static int config_props(AVFilterLink *outlink) if (!*s) return AVERROR(ENOMEM); - if (scale->opts) { - AVDictionaryEntry *e = NULL; - - while ((e = av_dict_get(scale->opts, "", e, AV_DICT_IGNORE_SUFFIX))) { - if ((ret = av_opt_set(*s, e->key, e->value, 0)) < 0) - return ret; - } - } - av_opt_set_int(*s, "srcw", inlink ->w, 0); av_opt_set_int(*s, "srch", inlink ->h >> !!i, 0); av_opt_set_int(*s, "src_format", inlink->format, 0); @@ -373,6 +364,13 @@ static int config_props(AVFilterLink *outlink) av_opt_set_int(*s, "dst_format", outfmt, 0); av_opt_set_int(*s, "sws_flags", scale->flags, 0); + if (scale->opts) { + AVDictionaryEntry *e = NULL; + while ((e = av_dict_get(scale->opts, "", e, AV_DICT_IGNORE_SUFFIX))) { + if ((ret = av_opt_set(*s, e->key, e->value, 0)) < 0) + return ret; + } + } /* Override YUV420P settings to have the correct (MPEG-2) chroma positions * MPEG-2 chroma positions are used by convention * XXX: support other 4:2:0 pixel formats */ -- cgit v1.2.3