--- xvid.c	2002/03/28 15:52:46	1.7
+++ xvid.c	2002/05/02 22:35:08	1.14
@@ -53,6 +53,7 @@
 #include "motion/sad.h"
 #include "utils/emms.h"
 #include "utils/timer.h"
+#include "bitstream/mbcoding.h"
 
 int xvid_init(void *handle, int opt, void *param1, void *param2)
 {
@@ -76,10 +77,13 @@
 
 	// initialize the function pointers
 	idct_int32_init();
-	
+	init_vlc_tables();
+
 	fdct = fdct_int32;
 	idct = idct_int32;
 
+	sadInit = 0;
+	
 	emms = emms_c;
 
 	quant_intra = quant_intra_c;
@@ -95,6 +99,7 @@
 	transfer_8to16copy = transfer_8to16copy_c;
 	transfer_16to8copy = transfer_16to8copy_c;
 	transfer_8to16sub = transfer_8to16sub_c;
+	transfer_8to16sub2 = transfer_8to16sub2_c;
 	transfer_16to8add = transfer_16to8add_c;
 	transfer8x8_copy = transfer8x8_copy_c;
 
@@ -122,6 +127,7 @@
 
 	calc_cbp = calc_cbp_c;
 	sad16 = sad16_c;
+	sad16bi = sad16bi_c;
 	sad8 = sad8_c;
 	dev16 = dev16_c;
 
@@ -189,12 +195,31 @@
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn;
 	}
 
+	if((cpu_flags & XVID_CPU_SSE2) > 0) {
+#ifdef EXPERIMENTAL_SSE2_CODE
+		quant_intra = quant_intra_sse2;
+		dequant_intra = dequant_intra_sse2;
+		quant_inter = quant_inter_sse2;
+		dequant_inter = dequant_inter_sse2;
+
+		calc_cbp = calc_cbp_sse2;
+		sad16 = sad16_sse2;
+		dev16 = dev16_sse2;
+		idct = idct_sse2;
+		fdct = fdct_sse2;
+#endif
+	}
+
 #endif
 #ifdef ARCH_PPC
 #ifdef ARCH_PPC_ALTIVEC
 	calc_cbp = calc_cbp_altivec;
 	fdct = fdct_altivec;
 	idct = idct_altivec;
+	sadInit = sadInit_altivec;
+	sad16 = sad16_altivec;
+	sad8 = sad8_altivec;
+	dev16 = dev16_altivec;
 #else
 	calc_cbp = calc_cbp_ppc;
 #endif