ffmpeg | branch: master | Christophe Gisquet <christophe.gisq...@gmail.com> | Wed Sep 23 15:06:01 2015 +0200| [552faecf4b1c60ac7fe805653fa3189a15bc21f0] | committer: 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: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=552faecf4b1c60ac7fe805653fa3189a15bc21f0 --- libavfilter/vf_scale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index a40b392..fd98abf 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
