diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-31 00:17:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-31 01:33:05 +0200 |
| commit | 58a0b7f1143511b712741af91d5f4bcbbe9d1488 (patch) | |
| tree | 21766fd53b72eac4d07674df277f471fcdd9040f /libavfilter/vf_scale.c | |
| parent | 5a00c30041a47f49c070b36939d64bcd3c811fe0 (diff) | |
| download | ffmpeg-58a0b7f1143511b712741af91d5f4bcbbe9d1488.tar.gz | |
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>
Diffstat (limited to 'libavfilter/vf_scale.c')
| -rw-r--r-- | libavfilter/vf_scale.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |