From ea6331f8bbaf3343faec6ffe77a6218a016a3af5 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 20 Jun 2011 10:24:33 -0400 Subject: [PATCH] h264-mt: fix deadlock in packets with multiple slices (e.g. MP4). --- libavcodec/h264.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b42468a781..dc4acb8379 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3685,6 +3685,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ switch (hx->nal_unit_type) { case NAL_SPS: case NAL_PPS: + case NAL_IDR_SLICE: + case NAL_SLICE: nals_needed = nal_index; } continue;