From: Gildas Bazin <gbazin@videolan.org>
Date: Mon, 6 Jun 2005 17:41:51 +0000 (+0000)
Subject: * modules/codec/x264.c: backport of 11322.
X-Git-Tag: 0.8.2~88
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=072c08340f7b91159468cc6f8641d7e2769eac33;p=vlc

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

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 747dafbcc2..000c20da04 100644
--- 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 );