aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_scale.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-08-30 23:49:04 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-08-31 01:33:05 +0200
commit5a00c30041a47f49c070b36939d64bcd3c811fe0 (patch)
treef617d52fc63508d4b2e930f9a78e144565b6c73f /libavfilter/vf_scale.c
parent75d9006475a1b07544ca3c116c02689c8cc1a90c (diff)
downloadffmpeg-5a00c30041a47f49c070b36939d64bcd3c811fe0.tar.gz
avfilter/vf_scale: Do not skip scale if the color matrix mismatches
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_scale.c')
-rw-r--r--libavfilter/vf_scale.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index be061e289c..01f0020f05 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)
;