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

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 27 19:43:08 2016 -0300| [a4044498f77771be855e3d262ccbfc36f5ebdeb4] | committer: James Almer

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

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4044498f77771be855e3d262ccbfc36f5ebdeb4
---

 libavformat/matroskadec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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)