Commit e5f61b94 authored by Alexander Strange's avatar Alexander Strange

H.264: Check the return value of decode_vui_parameters()

Files with invalid VUI are now rejected like
other invalid SPS are.

Fixes issue1231.

Originally committed as revision 19335 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 11d058b7
...@@ -7278,7 +7278,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ ...@@ -7278,7 +7278,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
sps->vui_parameters_present_flag= get_bits1(&s->gb); sps->vui_parameters_present_flag= get_bits1(&s->gb);
if( sps->vui_parameters_present_flag ) if( sps->vui_parameters_present_flag )
decode_vui_parameters(h, sps); if (decode_vui_parameters(h, sps) < 0)
goto fail;
if(s->avctx->debug&FF_DEBUG_PICT_INFO){ if(s->avctx->debug&FF_DEBUG_PICT_INFO){
av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n", av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment