[FFmpeg-cvslog] h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Mon Jun 20 10:24:33 2011 -0400| [ea6331f8bbaf3343faec6ffe77a6218a016a3af5] | committer: Ronald S. Bultje

h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea6331f8bbaf3343faec6ffe77a6218a016a3af5
---

 libavcodec/h264.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b42468a..dc4acb8 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;