diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2009-07-04 07:46:58 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2009-07-04 07:46:58 +0000 |
| commit | e5f61b94a16226e03ef0041ff65a3595e2b8e206 (patch) | |
| tree | b567ad063a29c84846a0697d7320850e00b0b490 /libavcodec | |
| parent | 11d058b7b351db8fb73104c847c5cc43b91735c6 (diff) | |
| download | ffmpeg-e5f61b94a16226e03ef0041ff65a3595e2b8e206.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c5630b7b2d..f6788cdedc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7278,7 +7278,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ sps->vui_parameters_present_flag= get_bits1(&s->gb); 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){ 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", |