--- quant.h	2007/07/03 20:46:44	1.5.2.2
+++ quant.h	2008/11/26 01:04:34	1.8
@@ -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: quant.h,v 1.5.2.2 2007/07/03 20:46:44 Isibaar Exp $
+ * $Id: quant.h,v 1.8 2008/11/26 01:04:34 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -54,13 +54,12 @@
 quant_intraFunc quant_h263_intra_c;
 quant_intraFunc quant_mpeg_intra_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 quant_intraFunc quant_h263_intra_mmx;
 quant_intraFunc quant_h263_intra_3dne;
 quant_intraFunc quant_h263_intra_sse2;
 
 quant_intraFunc quant_mpeg_intra_mmx;
-quant_intraFunc quant_mpeg_intra_xmm;
 #endif
 
 #ifdef ARCH_IS_IA64
@@ -71,16 +70,11 @@
 quant_intraFunc quant_h263_intra_altivec_c;
 #endif
 
-#ifdef ARCH_IS_X86_64
-quant_intraFunc quant_h263_intra_x86_64;
-quant_intraFunc quant_mpeg_intra_x86_64;
-#endif
-
 /* DeQuant functions */
 quant_intraFunc dequant_h263_intra_c;
 quant_intraFunc dequant_mpeg_intra_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 quant_intraFunc dequant_h263_intra_mmx;
 quant_intraFunc dequant_h263_intra_xmm;
 quant_intraFunc dequant_h263_intra_3dne;
@@ -99,11 +93,6 @@
 quant_intraFunc dequant_mpeg_intra_altivec_c;
 #endif
 
-#ifdef ARCH_IS_X86_64
-quant_intraFunc dequant_h263_intra_x86_64;
-quant_intraFunc dequant_mpeg_intra_x86_64;
-#endif
-
 /*****************************************************************************
  * Common API for Inter (de)Quant functions
  ****************************************************************************/
@@ -128,7 +117,7 @@
 quant_interFunc quant_h263_inter_c;
 quant_interFunc quant_mpeg_inter_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 quant_interFunc quant_h263_inter_mmx;
 quant_interFunc quant_h263_inter_3dne;
 quant_interFunc quant_h263_inter_sse2;
@@ -145,15 +134,10 @@
 quant_interFunc quant_h263_inter_altivec_c;
 #endif
 
-#ifdef ARCH_IS_X86_64
-quant_interFunc quant_h263_inter_x86_64;
-quant_interFunc quant_mpeg_inter_x86_64;
-#endif
-
 quant_interFunc dequant_h263_inter_c;
 quant_interFunc dequant_mpeg_inter_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 quant_interFunc dequant_h263_inter_mmx;
 quant_interFunc dequant_h263_inter_xmm;
 quant_interFunc dequant_h263_inter_3dne;
@@ -172,9 +156,4 @@
 quant_interFunc dequant_mpeg_inter_altivec_c;
 #endif
 
-#ifdef ARCH_IS_X86_64
-quant_interFunc dequant_h263_inter_x86_64;
-quant_interFunc dequant_mpeg_inter_x86_64;
-#endif
-
 #endif /* _QUANT_H_ */