videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/matroskadec: check for more reserved values on some Colour elements 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-09-27 19:43:08 -03:00
parent 9b8ac526f6
commit a4044498f7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroskadec.c
View File

@ -1810,9 +1810,11 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) {
if (track->video.color.matrix_coefficients != AVCOL_SPC_RESERVED)
st->codecpar->color_space = track->video.color.matrix_coefficients;
if (track->video.color.primaries != AVCOL_PRI_RESERVED)
if (track->video.color.primaries != AVCOL_PRI_RESERVED &&
track->video.color.primaries != AVCOL_PRI_RESERVED0)
st->codecpar->color_primaries = track->video.color.primaries;
if (track->video.color.transfer_characteristics != AVCOL_TRC_RESERVED)
if (track->video.color.transfer_characteristics != AVCOL_TRC_RESERVED &&
track->video.color.transfer_characteristics != AVCOL_TRC_RESERVED0)
st->codecpar->color_trc = track->video.color.transfer_characteristics;
if (track->video.color.range != AVCOL_RANGE_UNSPECIFIED &&
track->video.color.range <= AVCOL_RANGE_JPEG)