update to the 20090326 snapshot. This is not absolutely new, but there

was a period of relative quietness in x264 development, and I've been
testing this snapshot for some weeks (on i386).
There are too many changes to list here.

14 files changed, 90 insertions, 201 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 4bcfcca26ab..494ec29ed3c 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2009/02/03 08:44:15 obache Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/25 20:56:38 drochner Exp $
 
-SNAPSHOT_DATE=		20081217
+SNAPSHOT_DATE=		20090326
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
-PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 88913301fa0..739dea05517 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.16 2009/02/03 08:44:15 obache Exp $
+$NetBSD: distinfo,v 1.17 2009/05/25 20:56:38 drochner Exp $
 
-SHA1 (x264-snapshot-20081217-2245.tar.bz2) = 81f51f72f8ba78e478f829d5cfe41fb6afe846b0
-RMD160 (x264-snapshot-20081217-2245.tar.bz2) = 20b8504c62189ed654a066d81433a91c0e0a97e3
-Size (x264-snapshot-20081217-2245.tar.bz2) = 2336751 bytes
-SHA1 (patch-aa) = 0ff1c2c0942a08dc1d0e35923490ca039cd16d12
-SHA1 (patch-ab) = 37884e2bc562ec63c941c5932c663b14ff2e7c53
-SHA1 (patch-ac) = a8259f4b21daa19a11547a6af470bbb2376e7049
-SHA1 (patch-ad) = f43841b2a10a999647b83faa6e845724b0e93847
-SHA1 (patch-ae) = bd9b4eb54e0d6f465eea9976d4337bc6650fd5aa
-SHA1 (patch-af) = b006c53478e03ffc7e799ff293878438c8682fd3
-SHA1 (patch-ag) = c616a8c0cae024d223aec4adb6564fb2a302d36e
-SHA1 (patch-ah) = f6f4c384cb84b517b771e720e8f789e2070d6a4f
-SHA1 (patch-ai) = 5c796c6591f6c3614be769e0276a2c4f77479bae
-SHA1 (patch-aj) = 06eeceeb04aefef3a433a2e5934b60a32fd9c116
+SHA1 (x264-snapshot-20090326-2245.tar.bz2) = 4d28a02db4586986162368c18e607ca3b10b3453
+RMD160 (x264-snapshot-20090326-2245.tar.bz2) = fc6581a33970f012c660489eb2ae48f8ac9c151d
+Size (x264-snapshot-20090326-2245.tar.bz2) = 2466701 bytes
+SHA1 (patch-aa) = b2222f1f9fa66ba46d1512dfca76d9ac4c14eea4
+SHA1 (patch-ab) = ba276318f8e12626bdddbc978c00609d42921965
+SHA1 (patch-ac) = 0659b7f6ad1195c59c6298bc270b15990b1a8204
 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
-SHA1 (patch-al) = f2c5d0e8b38870e48105239b61999a06b8dbf5ce
 SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
+SHA1 (patch-an) = 69e2a8f6167fd2410c69e4df3e3a071c8c0c835f
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index e5978470aa5..c0e49d1d62b 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
+$NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
 
---- configure.orig	2008-12-12 16:45:07.000000000 -0500
+--- configure.orig	2009-03-26 22:45:08.000000000 +0100
 +++ configure
-@@ -130,7 +130,7 @@ for opt do
+@@ -117,7 +117,7 @@ for opt do
              LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
              ;;
          --enable-pthread)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
              ;;
          --disable-pthread)
              pthread="no"
-@@ -150,7 +150,7 @@ for opt do
+@@ -137,7 +137,7 @@ for opt do
              shared="yes"
              ;;
          --enable-visualize)
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
              CFLAGS="$CFLAGS -DVISUALIZE=1"
              vis="yes"
              ;;
-@@ -192,6 +192,10 @@ case $host_os in
+@@ -188,6 +188,10 @@ case $host_os in
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
@@ -31,15 +31,15 @@ $NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -247,7 +251,7 @@ case $host_cpu in
+@@ -244,7 +248,7 @@ case $host_cpu in
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
 -  x86_64)
 +  x86_64|amd64)
      ARCH="X86_64"
+     AS="yasm"
      if [ "$SYS" = MACOSX ];then
-       ASFLAGS="-f macho64 -m amd64 -DPIC -DPREFIX"
 @@ -258,11 +262,11 @@ case $host_cpu in
      fi
      ;;
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
 +      ARCH="POWERPC"
      else
 +      ARCH="PPC"
-       ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec"
+       ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H"
      fi
      ;;
 @@ -322,7 +326,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
  if test "$pthread" = "auto" ; then
      pthread="no"
      case $SYS in
-@@ -348,7 +352,7 @@ if test "$pthread" = "auto" ; then
+@@ -355,7 +359,7 @@ if test "$pthread" = "auto" ; then
      esac
  fi
  if test "$pthread" = "yes" ; then
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.6 2008/12/18 16:19:07 bjs Exp $
      LDFLAGS="$LDFLAGS $libpthread"
  fi
  
-@@ -378,7 +382,8 @@ if [ "$avis_input" = "yes" ] ; then
+@@ -392,7 +396,8 @@ if [ "$avis_input" = "yes" ] ; then
  fi
  
  if [ "$pic" = "yes" ] ; then
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index c3eab0d026d..a3d72590235 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
+$NetBSD: patch-ab,v 1.11 2009/05/25 20:56:38 drochner Exp $
 
---- Makefile.orig	2008-12-17 21:45:13.000000000 +0000
+--- Makefile.orig	2009-03-26 22:45:08.000000000 +0100
 +++ Makefile
 @@ -40,9 +40,9 @@ endif
  ifdef ARCH_X86
@@ -44,8 +44,8 @@ $NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
  default: $(DEP) x264$(EXE)
  
 -libx264.a: .depend $(OBJS) $(OBJASM)
--	ar rc libx264.a $(OBJS) $(OBJASM)
--	ranlib libx264.a
+-	$(AR) rc libx264.a $(OBJS) $(OBJASM)
+-	$(RANLIB) libx264.a
 +%.lo: %.c
 +	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
 +
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
  
 -x264$(EXE): $(OBJCLI) libx264.a 
 -	$(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) libx264.la 
++x264$(EXE): $(OBJCLI) libx264.la
 +	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
  
 -checkasm: tools/checkasm.o libx264.a
@@ -73,12 +73,12 @@ $NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
 +	${LIBTOOL} --mode=compile --tag=CC \
 +		./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
  # delete local/anonymous symbols, so they don't show up in oprofile
--	-@ strip -x $@
-+	-@ strip -x $(@:.lo=.o)
+-	-@ $(STRIP) -x $@
++	-@ $(STRIP) -x $(@:.lo=.o)
  
  .depend: config.mak
  	rm -f .depend
-@@ -144,21 +149,16 @@ distclean: clean
+@@ -143,21 +148,16 @@ distclean: clean
  	rm -f config.mak config.h x264.pc
  	rm -rf test/
  
@@ -91,7 +91,7 @@ $NetBSD: patch-ab,v 1.10 2009/02/03 08:44:15 obache Exp $
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
 -	install x264$(EXE) $(DESTDIR)$(bindir)
--	ranlib $(DESTDIR)$(libdir)/libx264.a
+-	$(RANLIB) $(DESTDIR)$(libdir)/libx264.a
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264$(EXE) $(DESTDIR)$(bindir)
  ifeq ($(SYS),MINGW)
  	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac
index 723527649e8..fb89a28129f 100644
--- a/multimedia/x264-devel/patches/patch-ac
+++ b/multimedia/x264-devel/patches/patch-ac
@@ -1,77 +1,38 @@
-$NetBSD: patch-ac,v 1.4 2008/12/18 16:19:07 bjs Exp $
+$NetBSD: patch-ac,v 1.5 2009/05/25 20:56:38 drochner Exp $
 
---- common/cpu.c.orig	2008-11-15 16:45:06.000000000 -0500
+--- common/cpu.c.orig	2009-04-05 21:01:48.000000000 +0200
 +++ common/cpu.c
-@@ -32,6 +32,10 @@
+@@ -33,7 +33,7 @@
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
+-#ifdef SYS_OPENBSD
 +#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
- 
- #include "common.h"
- #include "cpu.h"
-@@ -185,17 +189,28 @@ uint32_t x264_cpu_detect( void )
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <machine/cpu.h>
+@@ -200,13 +200,13 @@ uint32_t x264_cpu_detect( void )
  
  #elif defined( ARCH_PPC )
  
--#ifdef SYS_MACOSX
+-#if defined(SYS_MACOSX) || defined(SYS_OPENBSD)
 +#if defined(SYS_MACOSX) || defined(SYS_OPENBSD) || defined(SYS_NETBSD)
  #include <sys/sysctl.h>
-+#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
-+#include <machine/cpu.h>
-+#endif
  uint32_t x264_cpu_detect( void )
  {
      /* Thank you VLC */
      uint32_t cpu = 0;
--    int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
--    int      has_altivec = 0;
-+    int      selectors[2];
-+    int      has_altivec = 0, error;
-     size_t   length = sizeof( has_altivec );
--    int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
- 
+-#ifdef SYS_OPENBSD
 +#if defined(SYS_OPENBSD) || defined(SYS_NETBSD)
-+    selectors[0] = CTL_MACHDEP;
-+    selectors[1] = CPU_ALTIVEC;
-+#else
-+    selectors[0] = CTL_HW;
-+    selectors[1] = HW_VECTORUNIT;
-+#endif
-+
-+    error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
-     if( error == 0 && has_altivec != 0 )
-     {
-         cpu |= X264_CPU_ALTIVEC;
-@@ -285,7 +300,7 @@ int x264_cpu_num_processors( void )
-     get_system_info( &info );
-     return info.cpu_count;
- 
--#elif defined(SYS_MACOSX) || defined(SYS_FREEBSD)
-+#elif defined(SYS_MACOSX) || defined(SYS_FREEBSD)
-     int numberOfCPUs;
-     size_t length = sizeof( numberOfCPUs );
-     if( sysctlbyname("hw.ncpu", &numberOfCPUs, &length, NULL, 0) )
-@@ -294,6 +309,19 @@ int x264_cpu_num_processors( void )
-     }
-     return numberOfCPUs;
- 
-+#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD)
-+    int mib[2], numberOfCPUs;
-+    size_t length = sizeof( numberOfCPUs );
-+
-+    mib[0] = CTL_HW;
-+    mib[1] = HW_NCPU;
-+
-+    if( sysctl(mib, 2, &numberOfCPUs, &length, NULL, 0) )
-+    {
-+        numberOfCPUs = 1;
-+    }
-+    return numberOfCPUs;
-+
+     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
  #else
-     return 1;
- #endif
+     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
+@@ -223,7 +223,7 @@ uint32_t x264_cpu_detect( void )
+     return cpu;
+ }
+ 
+-#elif defined( SYS_LINUX )
++#elif defined(SYS_LINUX) || defined(SYS_NETBSD)
+ #include <signal.h>
+ #include <setjmp.h>
+ static sigjmp_buf jmpbuf;
diff --git a/multimedia/x264-devel/patches/patch-ad b/multimedia/x264-devel/patches/patch-ad
deleted file mode 100644
index ecf5e076d6c..00000000000
--- a/multimedia/x264-devel/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/12/18 16:19:07 bjs Exp $
-
---- common/osdep.h.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/osdep.h
-@@ -51,7 +51,7 @@
- #define X264_VERSION "" // no configure script for msvc
- #endif
- 
--#if defined(SYS_OPENBSD) || defined(SYS_SunOS)
-+#if defined(SYS_SunOS)
- #define isfinite finite
- #endif
- #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
diff --git a/multimedia/x264-devel/patches/patch-ae b/multimedia/x264-devel/patches/patch-ae
deleted file mode 100644
index bb264aaf619..00000000000
--- a/multimedia/x264-devel/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/12/18 16:19:07 bjs Exp $
-
---- common/ppc/deblock.c.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/ppc/deblock.c
-@@ -18,7 +18,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
- *****************************************************************************/
- 
--#if defined SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264-devel/patches/patch-af b/multimedia/x264-devel/patches/patch-af
deleted file mode 100644
index f11f538b3e4..00000000000
--- a/multimedia/x264-devel/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2008/12/18 16:19:07 bjs Exp $
-
---- common/ppc/mc.c.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/ppc/mc.c
-@@ -27,7 +27,7 @@
- #include <stdint.h>
- #include <stdarg.h>
- 
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264-devel/patches/patch-ag b/multimedia/x264-devel/patches/patch-ag
deleted file mode 100644
index 063d91f4667..00000000000
--- a/multimedia/x264-devel/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2008/12/18 16:19:08 bjs Exp $
-
---- common/ppc/pixel.c.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/ppc/pixel.c
-@@ -21,7 +21,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264-devel/patches/patch-ah b/multimedia/x264-devel/patches/patch-ah
deleted file mode 100644
index acf6c620ffc..00000000000
--- a/multimedia/x264-devel/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2008/12/18 16:19:08 bjs Exp $
-
---- common/ppc/predict.c.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/ppc/predict.c
-@@ -18,7 +18,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264-devel/patches/patch-ai b/multimedia/x264-devel/patches/patch-ai
deleted file mode 100644
index 4c53ba9a3f5..00000000000
--- a/multimedia/x264-devel/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2008/12/18 16:19:08 bjs Exp $
-
---- common/ppc/quant.c.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/ppc/quant.c
-@@ -18,7 +18,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
- *****************************************************************************/
- 
--#if defined SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264-devel/patches/patch-aj b/multimedia/x264-devel/patches/patch-aj
deleted file mode 100644
index d67475ed6ce..00000000000
--- a/multimedia/x264-devel/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2008/12/18 16:19:08 bjs Exp $
-
---- common/cpu.c.orig	2008-12-13 06:09:00.000000000 -0500
-+++ common/cpu.c
-@@ -226,7 +226,7 @@ uint32_t x264_cpu_detect( void )
-     return cpu;
- }
- 
--#elif defined( SYS_LINUX )
-+#elif defined(SYS_LINUX) || defined(SYS_NETBSD)
- #include <signal.h>
- #include <setjmp.h>
- static sigjmp_buf jmpbuf;
diff --git a/multimedia/x264-devel/patches/patch-al b/multimedia/x264-devel/patches/patch-al
deleted file mode 100644
index 576e98bcfbf..00000000000
--- a/multimedia/x264-devel/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2008/12/18 16:19:08 bjs Exp $
-
---- common/ppc/dct.c.orig	2008-12-12 16:45:07.000000000 -0500
-+++ common/ppc/dct.c
-@@ -21,7 +21,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264-devel/patches/patch-an b/multimedia/x264-devel/patches/patch-an
new file mode 100644
index 00000000000..56e5203e436
--- /dev/null
+++ b/multimedia/x264-devel/patches/patch-an
@@ -0,0 +1,40 @@
+$NetBSD: patch-an,v 1.1 2009/05/25 20:56:38 drochner Exp $
+
+--- common/x86/predict-c.c.orig	2009-04-05 21:31:54.000000000 +0200
++++ common/x86/predict-c.c
+@@ -110,7 +110,7 @@ PREDICT_16x16_P( mmxext )
+ #endif
+ PREDICT_16x16_P( sse2   )
+ 
+-#ifdef __GNUC__
++#if 0
+ static void predict_16x16_p_ssse3( uint8_t *src )
+ {
+     int a, b, c, i00;
+@@ -170,7 +170,7 @@ PREDICT_8x8_P( mmxext )
+ #endif
+ PREDICT_8x8_P( sse2   )
+ 
+-#ifdef __GNUC__
++#if 0
+ static void predict_8x8c_p_ssse3( uint8_t *src )
+ {
+     int a, b, c, i00;
+@@ -394,7 +394,7 @@ void x264_predict_16x16_init_mmx( int cp
+     if( !(cpu&X264_CPU_SSSE3) )
+         return;
+     pf[I_PRED_16x16_H]      = predict_16x16_h_ssse3;
+-#ifdef __GNUC__
++#if 0
+     pf[I_PRED_16x16_P]      = predict_16x16_p_ssse3;
+ #endif
+ }
+@@ -421,7 +421,7 @@ void x264_predict_8x8c_init_mmx( int cpu
+     if( !(cpu&X264_CPU_SSSE3) )
+         return;
+     pf[I_PRED_CHROMA_H]       = predict_8x8c_h_ssse3;
+-#ifdef __GNUC__
++#if 0
+     pf[I_PRED_CHROMA_P]       = predict_8x8c_p_ssse3;
+ #endif
+ }