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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ca0687ef63e3483df3320d6e0f0c9033b2e48d0d..978b192c2044e890abf2c138f7c3d5d6b082ce00 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -145,13 +145,10 @@ ifdef HAVE_DARWIN_OS
        .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
        .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
        .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .tag .goom2k4
+        .libdca .tag .x264 .goom2k4
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
-ifneq ($(HOST),i686-apple-darwin8)
-all: .x264
-endif
 else
 
  ifdef HAVE_BEOS

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,