From: Mans Rullgard <mans@mansr.com>
Date: Wed, 2 Mar 2011 13:08:15 +0000 (+0000)
Subject: threads: allow thread count of zero
X-Git-Tag: android-x86-4.4-r1~18260
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5cdef40a789822c7d859cd756e781b91893f2c0d;p=android-x86%2Fexternal-ffmpeg.git

threads: allow thread count of zero

This moves setting the thread count to a minimum of 1 to
frame_thread_init(), allowing a value of zero to propagate
through to the codec if frame threading is not used.  This
makes auto-threads work in libx264.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ff1efc524cb3c60f2f746e3b4550bb1a86c65316)
---

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 5b0d108ba5..658dbacb89 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -683,6 +683,11 @@ static int frame_thread_init(AVCodecContext *avctx)
     FrameThreadContext *fctx;
     int i, err = 0;
 
+    if (thread_count <= 1) {
+        avctx->active_thread_type = 0;
+        return 0;
+    }
+
     avctx->thread_opaque = fctx = av_mallocz(sizeof(FrameThreadContext));
 
     fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count);
@@ -882,8 +887,6 @@ int ff_thread_init(AVCodecContext *avctx, int thread_count)
         return -1;
     }
 
-    avctx->thread_count = FFMAX(1, thread_count);
-
     if (avctx->codec) {
         validate_thread_parameters(avctx);