RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity

vf_scale: conditionally override chroma position

Browse Source 
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: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Christophe Gisquet 2015-09-23 15:06:01 +02:00 committed by Michael Niedermayer
parent 3441fef0f8
commit 552faecf4b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_scale.c
View File

@ -388,14 +388,14 @@ static int config_props(AVFilterLink *outlink)
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
* 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;
}
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;
}