From 58a0b7f1143511b712741af91d5f4bcbbe9d1488 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 31 Aug 2015 00:17:50 +0200 Subject: 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 --- libavfilter/vf_scale.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavfilter/vf_scale.c') diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 01f0020f05..89a80ee2aa 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); -- cgit v1.2.3