From e9ccdae09b1913fa2427c2a7f87a5ba6ce8c5d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 27 Mar 2011 14:38:21 +0200 Subject: Use consistent condition for whether to run slice-threading execute function. --- libavcodec/mpeg12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 5db24e8..7034a91 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2344,7 +2344,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, -- cgit v1.1