Skip to content

V
vlc-1.1
Commit 072c0834 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/codec/x264.c: backport of 11322.

parent 6014f533
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
modules/codec/x264.c
View file @ 072c0834
...@@ -410,6 +410,11 @@ static int Open ( vlc_object_t *p_this ) ...@@ -410,6 +410,11 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.cpu &= ~X264_CPU_SSE2; p_sys->param.cpu &= ~X264_CPU_SSE2;
} }
#if X264_BUILD >= 29
if( p_enc->i_threads >= 1 )
p_sys->param.i_threads = p_enc->i_threads;
#endif
/* Open the encoder */ /* Open the encoder */
p_sys->h = x264_encoder_open( &p_sys->param ); p_sys->h = x264_encoder_open( &p_sys->param );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment