virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source 
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
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) if (track->video.color.matrix_coefficients != AVCOL_SPC_RESERVED)
st->codecpar->color_space = track->video.color.matrix_coefficients; 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; 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; st->codecpar->color_trc = track->video.color.transfer_characteristics;
if (track->video.color.range != AVCOL_RANGE_UNSPECIFIED && if (track->video.color.range != AVCOL_RANGE_UNSPECIFIED &&
track->video.color.range <= AVCOL_RANGE_JPEG) track->video.color.range <= AVCOL_RANGE_JPEG)