diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2011-04-08 03:03:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 03:03:03 +0200 |
| commit | d0df2934ca63a1d5c31602e6558f341bd738bd07 (patch) | |
| tree | 8b083b3b5c3881055c2077c2effe04337748e9eb | |
| parent | c88caa522c41cd4108d39d8dd98805e867606ae3 (diff) | |
| download | ffmpeg-d0df2934ca63a1d5c31602e6558f341bd738bd07.tar.gz | |
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@gmx.at>
| -rw-r--r-- | libavcodec/pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |