diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 01:43:08 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-10-06 19:49:29 +0300 |
| commit | a4044498f77771be855e3d262ccbfc36f5ebdeb4 (patch) | |
| tree | cda4282112823d23d708680e6f87649491d6ee00 /libavformat | |
| parent | 9b8ac526f6b283024327de27167dfd465f1ab158 (diff) | |
avformat/matroskadec: check for more reserved values on some Colour elements
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 32b24579e6..a94398bd82 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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) |