From f82163cf1c0515a59e6aed9748a17604f892c310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Fri, 1 Apr 2011 20:24:46 -0400
Subject: [PATCH] Use consistent condition for whether to run slice-threading
 execute function.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
 libavcodec/mpeg12.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 06aa8aba58..3e9f74a696 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2301,7 +2301,7 @@ static int decode_chunks(AVCodecContext *avctx,
             break;
 
         case PICTURE_START_CODE:
-            if (avctx->thread_count > 1 && s->slice_count) {
+            if (HAVE_THREADS && (avctx->active_thread_type&FF_THREAD_SLICE) && s->slice_count) {
                 int i;
 
                 avctx->execute(avctx, slice_decode_thread,