[FFmpeg-cvslog] Merge remote-tracking branch 'ffmpeg-mt/master'

[Alexander Strange]

ffmpeg | branch: master | Alexander Strange <astrange at ithinksw.com> | Fri Apr  8 03:03:03 2011 +0200| [d0df2934ca63a1d5c31602e6558f341bd738bd07] | committer: Michael Niedermayer

    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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0df2934ca63a1d5c31602e6558f341bd738bd07
---

 libavcodec/pthread.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index da63234..82b0732 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;
     }
 }