X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh264_ps.c;h=785836123eedf064a284a39029579b6914dd4dfc;hb=27324825defa0d2458a33aa34046ccfcdeac9502;hp=7e66ed72247c5ab9f36d09dc9f1d505e57763eeb;hpb=d1105e8f436e0b40f8cb83b8c1da09320351c2d0;p=ffmpeg diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 7e66ed72247..785836123ee 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -168,11 +168,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; } }