Mercurial > libavcodec.hg
comparison h264.c @ 9911:14edbbff0f25 libavcodec
H.264: Check the return value of decode_vui_parameters()
Files with invalid VUI are now rejected like
other invalid SPS are.
Fixes issue1231.
| author | astrange |
|---|---|
| date | Sat, 04 Jul 2009 07:46:58 +0000 |
| parents | d07aee233d03 |
| children | 266bf83f634d |
comparison
equal
deleted
inserted
replaced
| 9910:d07aee233d03 | 9911:14edbbff0f25 |
|---|---|
| 7276 sps->crop_bottom= 0; | 7276 sps->crop_bottom= 0; |
| 7277 } | 7277 } |
| 7278 | 7278 |
| 7279 sps->vui_parameters_present_flag= get_bits1(&s->gb); | 7279 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 7280 if( sps->vui_parameters_present_flag ) | 7280 if( sps->vui_parameters_present_flag ) |
| 7281 decode_vui_parameters(h, sps); | 7281 if (decode_vui_parameters(h, sps) < 0) |
| 7282 goto fail; | |
| 7282 | 7283 |
| 7283 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | 7284 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
| 7284 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", | 7285 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", |
| 7285 sps_id, sps->profile_idc, sps->level_idc, | 7286 sps_id, sps->profile_idc, sps->level_idc, |
| 7286 sps->poc_type, | 7287 sps->poc_type, |