OSDN Git Service

avcodec/h264: Put context_count check back
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 8 Jun 2016 10:32:57 +0000 (12:32 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 8 Jun 2016 13:15:00 +0000 (15:15 +0200)
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264.c

index 96943aa..c011527 100644 (file)
@@ -1270,10 +1270,12 @@ again:
                 av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
             sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0;
         } else if (err == SLICE_SINGLETHREAD) {
-            ret = ff_h264_execute_decode_slices(h, context_count);
-            if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
-                goto end;
-            context_count = 0;
+            if (context_count > 0) {
+                ret = ff_h264_execute_decode_slices(h, context_count);
+                if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
+                    goto end;
+                context_count = 0;
+            }
             /* Slice could not be decoded in parallel mode, restart. Note
              * that rbsp_buffer is not transferred, but since we no longer
              * run in parallel mode this should not be an issue. */