diff mbox

[FFmpeg-devel,2/2] avformat/matroskadec: check for more reserved values on some Colour elements

Message ID 20160927234903.4184-2-jamrial@gmail.com
State Accepted
Commit a4044498f77771be855e3d262ccbfc36f5ebdeb4
Headers show

Commit Message

James Almer Sept. 27, 2016, 11:49 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/matroskadec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 32b2457..a94398b 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)