--- xvid.c	2002/06/23 03:58:32	1.21
+++ xvid.c	2002/07/07 09:38:13	1.24
@@ -27,6 +27,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  ****************************************************************************/
+
 /*****************************************************************************
  *
  *  History
@@ -36,7 +37,7 @@
  *  - 22.12.2001  API change: added xvid_init() - Isibaar
  *  - 16.12.2001	inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: xvid.c,v 1.21 2002/06/23 03:58:32 suxen_drol Exp $
+ *  $Id: xvid.c,v 1.24 2002/07/07 09:38:13 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -98,11 +99,7 @@
 		cpu_flags = init_param->cpu_flags;
 	} else {
 
-#ifdef ARCH_X86
 		cpu_flags = check_cpu_features();
-#else
-		cpu_flags = 0;
-#endif
 		init_param->cpu_flags = cpu_flags;
 	}
 
@@ -197,9 +194,11 @@
 		transfer_8to16copy = transfer_8to16copy_mmx;
 		transfer_16to8copy = transfer_16to8copy_mmx;
 		transfer_8to16sub  = transfer_8to16sub_mmx;
+		transfer_8to16sub2 = transfer_8to16sub2_mmx;
 		transfer_16to8add  = transfer_16to8add_mmx;
 		transfer8x8_copy   = transfer8x8_copy_mmx;
 
+
 		/* Image Interpolation related functions */
 		interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
@@ -244,6 +243,7 @@
 
 		/* ME functions */
 		sad16 = sad16_xmm;
+		sad16bi = sad16bi_xmm;
 		sad8  = sad8_xmm;
 		dev16 = dev16_xmm;
 
@@ -260,6 +260,8 @@
 	if ((cpu_flags & XVID_CPU_SSE2) > 0) {
 #ifdef EXPERIMENTAL_SSE2_CODE
 
+		calc_cbp = calc_cbp_sse2;
+
 		/* Quantization */
 		quant_intra   = quant_intra_sse2;
 		dequant_intra = dequant_intra_sse2;
@@ -267,7 +269,6 @@
 		dequant_inter = dequant_inter_sse2;
 
 		/* ME */
-		calc_cbp = calc_cbp_sse2;
 		sad16    = sad16_sse2;
 		dev16    = dev16_sse2;