From 9a1feb860806d99ff33c8900bd919389f0f7e6bd Mon Sep 17 00:00:00 2001 From: Jeff Downs Date: Fri, 14 Dec 2007 22:49:30 +0000 Subject: [PATCH] Fix brain-dead parts of r11216, specifically: Actually unreference removed pics And check for too many reference frames as originally intended, not equal to max reference frames. Originally committed as revision 11218 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ee00f2166a..fd265ddc4e 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3612,8 +3612,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ s->current_picture_ptr->reference |= s->picture_structure; } - if (h->sps.ref_frame_count && - h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ + if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){ /* We have too many reference frames, probably due to corrupted * stream. Need to discard one frame. Prevents overrun of the @@ -3629,10 +3628,13 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ break; assert(i < 16); + pic = h->long_ref[i]; remove_long_at_index(h, i); } else { + pic = h->short_ref[h->short_ref_count - 1]; remove_short_at_index(h, h->short_ref_count - 1); } + unreference_pic(h, pic, 0); } print_short_term(h);