diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2007-02-16 21:34:21 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2007-02-16 21:34:21 +0000 |
commit | 187696fa72ec47c7151cd3cc708e224fe2eccb55 (patch) | |
tree | c2a5e9ec5e9bdaac35547811c3c239b1bba74bb4 /libavcodec/h264.c | |
parent | 0565c648343cb7d1220da903308ff0aaf89d96b8 (diff) | |
download | ffmpeg-187696fa72ec47c7151cd3cc708e224fe2eccb55.tar.gz |
fix 2nd ref_count check
add list_count
Originally committed as revision 7998 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 41bdc220e0..f2630b5e21 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -326,6 +326,7 @@ typedef struct H264Context{ * num_ref_idx_l0/1_active_minus1 + 1 */ unsigned int ref_count[2]; ///< counts frames or fields, depending on current mb mode + unsigned int list_count; Picture *short_ref[32]; Picture *long_ref[32]; Picture default_ref_list[2][32]; @@ -4706,13 +4707,18 @@ static int decode_slice_header(H264Context *h){ if(h->slice_type==B_TYPE) h->ref_count[1]= get_ue_golomb(&s->gb) + 1; - if(h->ref_count[0] > 32 || h->ref_count[1] > 32){ + if(h->ref_count[0]-1 > 32-1 || h->ref_count[1]-1 > 32-1){ av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); h->ref_count[0]= h->ref_count[1]= 1; return -1; } } - } + if(h->slice_type == B_TYPE) + h->list_count= 2; + else + h->list_count= 1; + }else + h->list_count= 0; if(!default_ref_list_done){ fill_default_ref_list(h); |