Commit 552faecf authored by Christophe Gisquet's avatar Christophe Gisquet Committed by Michael Niedermayer

vf_scale: conditionally override chroma position

For yuv420p, the chroma position is unilaterally overriden, even
if ffmpeg's command-line explicitly set it. To fix this, override
only if the value is the default one.

Regression since 1515bfb3.
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 3441fef0
...@@ -388,14 +388,14 @@ static int config_props(AVFilterLink *outlink) ...@@ -388,14 +388,14 @@ static int config_props(AVFilterLink *outlink)
return ret; return ret;
} }
} }
/* Override YUV420P settings to have the correct (MPEG-2) chroma positions /* Override YUV420P default 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 */
if (inlink0->format == AV_PIX_FMT_YUV420P) { if (inlink0->format == AV_PIX_FMT_YUV420P && scale->in_v_chr_pos == -513) {
scale->in_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192; scale->in_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192;
} }
if (outlink->format == AV_PIX_FMT_YUV420P) { if (outlink->format == AV_PIX_FMT_YUV420P && scale->out_v_chr_pos == -513) {
scale->out_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192; scale->out_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment