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.
---
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;
}
--
1.9.2.msysgit.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
