[FFmpeg-cvslog] avfilter/vf_scale: If no output color matrix is specified, use the input

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Aug 31 00:17:50 2015 +0200| [58a0b7f1143511b712741af91d5f4bcbbe9d1488] | committer: Michael Niedermayer

avfilter/vf_scale: If no output color matrix is specified, use the input

This should only affect yuv->yuv, and not change behavior

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

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

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

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 01f0020..89a80ee 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -535,6 +535,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
             inv_table = parse_yuv_type(scale->in_color_matrix, av_frame_get_colorspace(in));
         if (scale->out_color_matrix)
             table     = parse_yuv_type(scale->out_color_matrix, AVCOL_SPC_UNSPECIFIED);
+        else if (scale->in_color_matrix)
+            table = inv_table;
 
         if (scale-> in_range != AVCOL_RANGE_UNSPECIFIED)
             in_full  = (scale-> in_range == AVCOL_RANGE_JPEG);