[SCM] libav/experimental: H.264: Check the return value of decode_vui_parameters()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e5f61b94a16226e03ef0041ff65a3595e2b8e206
Author: Alexander Strange <astrange at ithinksw.com>
Date:   Sat Jul 4 07:46:58 2009 +0000

    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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c5630b7..f6788cd 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",

-- 
Libav/FFmpeg packaging