avformat/matroskadec: check for more reserved values on some Colour elements
authorJames Almer <jamrial@gmail.com>
Tue, 27 Sep 2016 22:43:08 +0000 (19:43 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 6 Oct 2016 16:49:29 +0000 (13:49 -0300)
Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/matroskadec.c

index 32b2457..a94398b 100644 (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)