Commit 58a0b7f1 authored by Michael Niedermayer's avatar 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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 5a00c300
...@@ -535,6 +535,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) ...@@ -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)); inv_table = parse_yuv_type(scale->in_color_matrix, av_frame_get_colorspace(in));
if (scale->out_color_matrix) if (scale->out_color_matrix)
table = parse_yuv_type(scale->out_color_matrix, AVCOL_SPC_UNSPECIFIED); 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) if (scale-> in_range != AVCOL_RANGE_UNSPECIFIED)
in_full = (scale-> in_range == AVCOL_RANGE_JPEG); in_full = (scale-> in_range == AVCOL_RANGE_JPEG);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment