* forward port my fixed temporary fix and re-enable x264 in the contribs

[vlc] / modules / codec / x264.c

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 02a00891979ae32733c26c08157cfb839539df07..74e9d067f8637cc6deaa5170c799204019a1c643 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -534,8 +534,13 @@ vlc_module_begin();
 
 /* Input/Output */
 
+#if defined(__DARWIN__) && defined(__INTEL__)
+    add_bool( SOUT_CFG_PREFIX "asm", 0, NULL, ASM_TEXT,
+              ASM_LONGTEXT, VLC_FALSE );
+#else
     add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT,
               ASM_LONGTEXT, VLC_FALSE );
+#endif
 
     /* x264 psnr = 1 (default). disable PSNR computation for speed. */
     add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT,