From 4c7a232fc81fdbdee279ab819a255f624a22b083 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 2 Oct 2011 14:03:47 +0000 Subject: [PATCH] h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering() Signed-off-by: Janne Grunau --- libavcodec/h264.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index aac1a15a92..4dbd06375b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2857,8 +2857,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ff_h264_fill_default_ref_list(h); } - if(h->slice_type_nos!=AV_PICTURE_TYPE_I && ff_h264_decode_ref_pic_list_reordering(h) < 0) + if(h->slice_type_nos!=AV_PICTURE_TYPE_I && ff_h264_decode_ref_pic_list_reordering(h) < 0) { + h->ref_count[1]= h->ref_count[0]= 0; return -1; + } if(h->slice_type_nos!=AV_PICTURE_TYPE_I){ s->last_picture_ptr= &h->ref_list[0][0];