[FFmpeg-cvslog] avfilter/vf_scale: Do not skip scale if the color matrix mismatches

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Aug 30 23:49:04 2015 +0200| [5a00c30041a47f49c070b36939d64bcd3c811fe0] | committer: Michael Niedermayer

avfilter/vf_scale: Do not skip scale if the color matrix mismatches

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a00c30041a47f49c070b36939d64bcd3c811fe0
---

 libavfilter/vf_scale.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index be061e2..01f0020 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -350,6 +350,7 @@ static int config_props(AVFilterLink *outlink)
     scale->isws[0] = scale->isws[1] = scale->sws = NULL;
     if (inlink0->w == outlink->w &&
         inlink0->h == outlink->h &&
+        !scale->out_color_matrix &&
         scale->in_range == scale->out_range &&
         inlink0->format == outlink->format)
         ;