Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
0f453853
Commit
0f453853
authored
Apr 10, 2008
by
Loren Merritt
Browse files
threads=auto on multicore now implies thread input, just like explicit thread numbers already did
parent
539103a5
Changes
1
Hide whitespace changes
Inline
Side-by-side
x264.c
View file @
0f453853
...
...
@@ -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
)
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment