git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75d9006
)
avfilter/vf_scale: Do not skip scale if the color matrix mismatches
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 30 Aug 2015 21:49:04 +0000
(23:49 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 30 Aug 2015 23:33:05 +0000
(
01:33
+0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_scale.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_scale.c
b/libavfilter/vf_scale.c
index
be061e2
..
01f0020
100644
(file)
--- 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)
;