From d0df2934ca63a1d5c31602e6558f341bd738bd07 Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Fri, 8 Apr 2011 03:03:03 +0200 Subject: Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: DUPLICATE mingw32 compilation after 'unbreak avcodec_thread_init' pthread: validate_thread_parameters() ignored slice-threading being intentionally off DUPLICATE Remove unnecessary parameter from ff_thread_init() and fix behavior Signed-off-by: Michael Niedermayer --- libavcodec/pthread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index da63234887..82b0732592 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -877,7 +877,7 @@ static void validate_thread_parameters(AVCodecContext *avctx) avctx->active_thread_type = 0; } else if (frame_threading_supported && (avctx->thread_type & FF_THREAD_FRAME)) { avctx->active_thread_type = FF_THREAD_FRAME; - } else { + } else if (avctx->thread_type & FF_THREAD_SLICE) { avctx->active_thread_type = FF_THREAD_SLICE; } } -- cgit v1.2.3