--- trunk/xvidcore/src/motion/gmc.c	2008/11/14 15:43:28	1794
+++ trunk/xvidcore/src/motion/gmc.c	2011/05/18 09:10:05	1988
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: gmc.c,v 1.8 2008-11-14 15:43:27 Isibaar Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -48,7 +48,7 @@
 log2bin(uint32_t value)
 {
 /* Changed by Chenm001 */
-#if !defined(_MSC_VER)
+#if !defined(_MSC_VER) || defined(ARCH_IS_X86_64)
   int n = 0;
 
   while (value) {
@@ -385,7 +385,7 @@
 	mv->y = RSHIFT(Dsp->Vo<<qpel, 3);
 }
 
-#if defined(ARCH_IS_IA32)
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 /* *************************************************************
  * MMX core function
  */
@@ -590,7 +590,7 @@
       Predict_16x16_func = Predict_16x16_C;
       Predict_8x8_func   = Predict_8x8_C;
 
-#if defined(ARCH_IS_IA32)
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
       if ((cpu_flags & XVID_CPU_MMX)   || (cpu_flags & XVID_CPU_MMXEXT)   ||
           (cpu_flags & XVID_CPU_3DNOW) || (cpu_flags & XVID_CPU_3DNOWEXT) ||
           (cpu_flags & XVID_CPU_SSE)   || (cpu_flags & XVID_CPU_SSE2) ||
@@ -598,15 +598,13 @@
 	{
 	   Predict_16x16_func = Predict_16x16_mmx;
 	   Predict_8x8_func   = Predict_8x8_mmx;
-#if 0
-       if (cpu_flags & XVID_CPU_SSE41)
+
+           if (cpu_flags & XVID_CPU_SSE41)
 	     GMC_Core_Lin_8 = xvid_GMC_Core_Lin_8_sse41;
-	   else
-#endif
-	   if (cpu_flags & XVID_CPU_SSE2)
+	   else if (cpu_flags & XVID_CPU_SSE2)
 	     GMC_Core_Lin_8 = xvid_GMC_Core_Lin_8_sse2;
 	   else
-         GMC_Core_Lin_8 = xvid_GMC_Core_Lin_8_mmx;
+             GMC_Core_Lin_8 = xvid_GMC_Core_Lin_8_mmx;
 	}
 #endif
 }