* disable SSE2 optmisations in quite a hacky way, but enable MMX

extras/contrib/src/Makefile

@@ -1208,7 +1208,11 @@ ifeq ($(HOST),i686-apple-darwin8)
 else
 .x264: x264
 endif
+ifeq ($(HOST),i686-apple-darwin8)
+	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && patch -p0 <../Patches/x264-osx-intel.patch && make && make install)
+else
 	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+endif
 	touch $@
 
 CLEAN_FILE += .x264

extras/contrib/src/Patches/x264-osx-intel.patch

+--- config.mak	2006-10-15 16:52:23.000000000 +0200
++++ config.mak	2006-10-15 16:52:34.000000000 +0200
+@@ -6,7 +6,7 @@
+ ARCH=X86
+ SYS=MACOSX
+ CC=gcc
+-CFLAGS=-Wall -I. -O4 -ffast-math -D__X264__ -falign-loops=16 -DHAVE_MMXEXT -DHAVE_SSE2 -DARCH_X86 -DSYS_MACOSX -DHAVE_PTHREAD -fPIC -s -fomit-frame-pointer
++CFLAGS=-Wall -I. -O4 -ffast-math -D__X264__ -falign-loops=16 -DHAVE_MMXEXT -DARCH_X86 -DSYS_MACOSX -DHAVE_PTHREAD -fPIC -s -fomit-frame-pointer
+ LDFLAGS= -lm -lmx -lpthread -s
+ AS=nasm
+ ASFLAGS=-O2 -f macho -DPREFIX -D__PIC__

modules/codec/x264.c

@@ -554,13 +554,8 @@ 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,