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

[vlc] / modules / codec / x264.c

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 747dafbcc2a0fb76970e25b228a58a257a6728f2..000c20da04ff73f5db2dc55c6cf1f9629020ba95 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -410,6 +410,11 @@ static int  Open ( vlc_object_t *p_this )
         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 */
     p_sys->h = x264_encoder_open( &p_sys->param );