generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_scale: apply generic options after flags.

Browse Source 
Otherwise the flags overwrite anything set by the generic stuff to the flags

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-08-08 14:43:12 +02:00
parent e755954a84
commit d3d776ccf9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vf_scale.c
View File

@ -356,15 +356,6 @@ static int config_props(AVFilterLink *outlink)
if (!*s) if (!*s)
return AVERROR(ENOMEM); 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, "srcw", inlink ->w, 0);
av_opt_set_int(*s, "srch", inlink ->h >> !!i, 0); av_opt_set_int(*s, "srch", inlink ->h >> !!i, 0);
av_opt_set_int(*s, "src_format", inlink->format, 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, "dst_format", outfmt, 0);
av_opt_set_int(*s, "sws_flags", scale->flags, 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 /* Override YUV420P settings to have the correct (MPEG-2) chroma positions
* MPEG-2 chroma positions are used by convention * MPEG-2 chroma positions are used by convention
* XXX: support other 4:2:0 pixel formats */ * XXX: support other 4:2:0 pixel formats */