MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_scale: reset color matrix in case of identity & non-RGB 

Fixes passing through mismatching metadata from the input side
when RGB input (from f.ex. H.264 or HEVC) gets converted to YCbCr.

Fixes #9132
This commit is contained in:
Jan Ekström 2021-08-22 23:28:55 +03:00
parent ffc00e5b16
commit 9dd410c804
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_scale.c
View File

@ -738,6 +738,15 @@ scale:
out->width = outlink->w;
out->height = outlink->h;
// Sanity check: If we've got the RGB/XYZ (identity) matrix configured, and
// the output is no longer RGB, unset the matrix.
// In theory this should be in swscale itself as the AVFrame
// based API gets in, so that not every swscale API user has
// to go through duplicating such sanity checks.
if (out->colorspace == AVCOL_SPC_RGB &&
!(av_pix_fmt_desc_get(out->format)->flags & AV_PIX_FMT_FLAG_RGB))
out->colorspace = AVCOL_SPC_UNSPECIFIED;
if (scale->output_is_pal)
avpriv_set_systematic_pal2((uint32_t*)out->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format);