diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-08-02 18:10:41 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-08-18 14:05:44 +0400 |
| commit | 41d134a402d51f6234e7ad6333cc495e1ad6e76c (patch) | |
| tree | d9310689cb93eacabece269d3caad55cfdb617ba | |
| parent | 94683412a5065a6c4d14f3a65ee364941ab345a3 (diff) | |
Revert "h264-mt: fix deadlock in packets with multiple slices (e.g. MP4)."lav0.32
This change caused certain H264 files to decoder very slowly, as if
multi-threading is completely turned off for them. Since those files are far
more common then the ones causing deadlocks - this seems like a poor idea.
This reverts commit ea6331f8bbaf3343faec6ffe77a6218a016a3af5.
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f3d4dbd694..4b05e48737 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3680,8 +3680,6 @@ 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; |