From 820109224142323f182c2917e3d8ddc34324b5df Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Apr 2012 15:16:36 +0200 Subject: [PATCH] h264: reset current_slice on context reinit This fixes a null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2903cf9a6d..117cd7e630 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2975,6 +2975,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) flush_dpb(s->avctx); ff_MPV_common_end(s); h->list_count = 0; + h->current_slice = 0; } if (!s->context_initialized) { if (h != h0) {