From: Loren Merritt <pengvado@akuvian.org>
Date: Thu, 10 Apr 2008 09:17:53 +0000 (-0600)
Subject: threads=auto on multicore now implies thread input, just like explicit thread numbers... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f453853989c33919769b1a8376d7daf6acfccd2;p=libx264

threads=auto on multicore now implies thread input, just like explicit thread numbers already did
---

diff --git a/x264.c b/x264.c
index efdc5c3a..51bd0cd9 100644
--- a/x264.c
+++ b/x264.c
@@ -29,6 +29,7 @@
 #include <getopt.h>
 
 #include "common/common.h"
+#include "common/cpu.h"
 #include "x264.h"
 #include "muxers.h"
 
@@ -664,7 +665,8 @@ static int  Parse( int argc, char **argv,
     }
 
 #ifdef HAVE_PTHREAD
-    if( b_thread_input || param->i_threads > 1 )
+    if( b_thread_input || param->i_threads > 1
+        || (param->i_threads == 0 && x264_cpu_num_processors() > 1) )
     {
         if( open_file_thread( NULL, &opt->hin, param ) )
         {