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

072c0834 · Gildas Bazin · 6014f533 · 072c0834
Commit 072c0834 authored Jun 06, 2005 by Gildas Bazin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

modules/codec/x264.c modules/codec/x264.c +5 -0

No files found.
--- 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 );