From ff9db5cfd14558df9cfcc54d6c062bc34bf1f341 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 30 Nov 2016 17:09:33 -0500 Subject: lavc: Use a stricter check for the color properties values Signed-off-by: Vittorio Giovara --- libavcodec/hevc_ps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/hevc_ps.c') diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index c28e86b..2471907 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -497,11 +497,11 @@ static void decode_vui(GetBitContext *gb, AVCodecContext *avctx, vui->matrix_coeffs = get_bits(gb, 8); // Set invalid values to "unspecified" - if (vui->colour_primaries >= AVCOL_PRI_NB) + if (!av_color_primaries_name(vui->colour_primaries)) vui->colour_primaries = AVCOL_PRI_UNSPECIFIED; - if (vui->transfer_characteristic >= AVCOL_TRC_NB) + if (!av_color_transfer_name(vui->transfer_characteristic)) vui->transfer_characteristic = AVCOL_TRC_UNSPECIFIED; - if (vui->matrix_coeffs >= AVCOL_SPC_NB) + if (!av_color_space_name(vui->matrix_coeffs)) vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED; } } -- cgit v1.1