From 704952fee52f4033018919fee7815ee3bc833280 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 14 Feb 2013 11:44:33 +0100 Subject: [PATCH] h264: set ref_count to 0 for intra slices. CC:libav-stable@libav.org (cherry picked from commit 437211ae73ef1ed8285b4fed7620502ea4999e11) Fixes deadlocks waiting for non-existing references with some fuzzed files. Signed-off-by: Reinhard Tartler --- libavcodec/h264.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6f49dd28f2..54f618653d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3039,8 +3039,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0) h->list_count = 2; else h->list_count = 1; - } else + } else { h->list_count = 0; + h->ref_count[0] = h->ref_count[1] = 0; + } + max_refs = s->picture_structure == PICT_FRAME ? 16 : 32;