avcodec/h264: finish previous slices before switching to single thread mode
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Apr 2015 00:47:36 +0000 (02:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Apr 2015 20:01:46 +0000 (22:01 +0200)
Fixes null pointer dereference
Fixes Ticket4438

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)

Conflicts:

libavcodec/h264.c

libavcodec/h264.c

index e64cc07..6fa0b7b 100644 (file)
@@ -1680,6 +1680,12 @@ again:
                     av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
                 h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
             } else if (err == SLICE_SINGLETHREAD) {
+                if (context_count > 1) {
+                    ret = ff_h264_execute_decode_slices(h, context_count - 1);
+                    if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
+                        goto end;
+                    context_count = 0;
+                }
                 /* Slice could not be decoded in parallel mode, copy down
                  * NAL unit stuff to context 0 and restart. Note that
                  * rbsp_buffer is not transferred, but since we no longer