[x264-devel] commit: threads=auto on multicore now implies thread input, just like explicit thread numbers already did (Loren Merritt )

[git version control]

x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Thu Apr 10 03:17:53 2008 -0600| [761630d7f646d4ad3562e7ff55fa7c80f8dce039]

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

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=761630d7f646d4ad3562e7ff55fa7c80f8dce039
---

 x264.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/x264.c b/x264.c
index efdc5c3..51bd0cd 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 ) )
         {