1. ffmpeg
  2. Commit 58a0b7f1143511b712741af91d5f4bcbbe9d1488
Browse code

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@niedermayer.cc>

Michael Niedermayer authored on 2015/08/31 07:17:50
Showing 1 changed files
libavfilter/vf_scale.c
History View file @ 58a0b7f
... ... 
@@ -535,6 +535,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
535 535 
             inv_table = parse_yuv_type(scale->in_color_matrix, av_frame_get_colorspace(in));
536 536 
         if (scale->out_color_matrix)
537 537 
             table     = parse_yuv_type(scale->out_color_matrix, AVCOL_SPC_UNSPECIFIED);
538 
+        else if (scale->in_color_matrix)
539 
+            table = inv_table;
538 540
539 541 
         if (scale-> in_range != AVCOL_RANGE_UNSPECIFIED)
540 542 
             in_full  = (scale-> in_range == AVCOL_RANGE_JPEG);