diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-30 17:09:33 -0500 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-12-02 11:36:42 -0500 |
commit | ff9db5cfd14558df9cfcc54d6c062bc34bf1f341 (patch) | |
tree | 6e83bfcc085c2913d81c013e4b69d630dbeef585 /libavcodec/h264_ps.c | |
parent | 0a35f128f3c6e0ae9a0a2236c557602c108da269 (diff) |
lavc: Use a stricter check for the color properties values
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/h264_ps.c')
-rw-r--r-- | libavcodec/h264_ps.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 37c3be1cb9..8a64a33780 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -191,11 +191,13 @@ static inline int decode_vui_parameters(GetBitContext *gb, AVCodecContext *avctx sps->color_primaries = get_bits(gb, 8); /* colour_primaries */ sps->color_trc = get_bits(gb, 8); /* transfer_characteristics */ sps->colorspace = get_bits(gb, 8); /* matrix_coefficients */ - if (sps->color_primaries >= AVCOL_PRI_NB) + + // Set invalid values to "unspecified" + if (!av_color_primaries_name(sps->color_primaries)) sps->color_primaries = AVCOL_PRI_UNSPECIFIED; - if (sps->color_trc >= AVCOL_TRC_NB) + if (!av_color_transfer_name(sps->color_trc)) sps->color_trc = AVCOL_TRC_UNSPECIFIED; - if (sps->colorspace >= AVCOL_SPC_NB) + if (!av_color_space_name(sps->colorspace)) sps->colorspace = AVCOL_SPC_UNSPECIFIED; } } |