diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-06-20 10:24:33 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-06-20 10:24:33 -0400 |
| commit | ea6331f8bbaf3343faec6ffe77a6218a016a3af5 (patch) | |
| tree | 6467528b9387be988c9f85ecb91267546442252e /libavcodec/h264.c | |
| parent | ae88e9cf99837e5eec811c817a17b2cbc9724a01 (diff) | |
h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |