From 0f453853989c33919769b1a8376d7daf6acfccd2 Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Thu, 10 Apr 2008 03:17:53 -0600 Subject: [PATCH] threads=auto on multicore now implies thread input, just like explicit thread numbers already did --- x264.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x264.c b/x264.c index efdc5c3a..51bd0cd9 100644 --- a/x264.c +++ b/x264.c @@ -29,6 +29,7 @@ #include #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 ) ) { -- 2.50.1