Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37'

[ffmpeg] / libavfilter / vf_scale.c

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index a40b392c653e2a7edb9724737709e031d483f0a2..fd98abf7ea7b3ba4eac19bdd26293a4a38599867 100644 (file)
--- 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;
             }