--- xvid.c	2002/09/24 16:30:05	1.33.2.2
+++ xvid.c	2002/11/02 16:11:07	1.33.2.10
@@ -37,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.33.2.2 2002/09/24 16:30:05 Isibaar Exp $
+ *  $Id: xvid.c,v 1.33.2.10 2002/11/02 16:11:07 chl Exp $
  *
  ****************************************************************************/
 
@@ -50,6 +50,7 @@
 #include "image/colorspace.h"
 #include "image/interpolate8x8.h"
 #include "utils/mem_transfer.h"
+#include "utils/mbfunctions.h"
 #include "quant/quant_h263.h"
 #include "quant/quant_mpeg4.h"
 #include "motion/motion.h"
@@ -216,11 +217,28 @@
 	transfer_16to8add  = transfer_16to8add_c;
 	transfer8x8_copy   = transfer8x8_copy_c;
 
+	/* Interlacing functions */
+	MBFieldTest = MBFieldTest_c;
+
 	/* Image interpolation related functions */
 	interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_c;
 	interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;
 	interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;
 
+	interpolate16x16_lowpass_h = interpolate16x16_lowpass_h_c;
+	interpolate16x16_lowpass_v = interpolate16x16_lowpass_v_c;
+	interpolate16x16_lowpass_hv = interpolate16x16_lowpass_hv_c;
+
+	interpolate8x8_lowpass_h = interpolate8x8_lowpass_h_c;
+	interpolate8x8_lowpass_v = interpolate8x8_lowpass_v_c;
+	interpolate8x8_lowpass_hv = interpolate8x8_lowpass_hv_c;
+
+	interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_c;
+	interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_c;
+
+	interpolate8x8_avg2 = interpolate8x8_avg2_c;
+	interpolate8x8_avg4 = interpolate8x8_avg4_c;
+
 	/* Initialize internal colorspace transformation tables */
 	colorspace_init();
 
@@ -238,6 +256,8 @@
 	yv12_to_rgb565 = yv12_to_rgb565_c;
 	yv12_to_rgb24  = yv12_to_rgb24_c;
 	yv12_to_rgb32  = yv12_to_rgb32_c;
+	yv12_to_abgr  = yv12_to_abgr_c;
+	yv12_to_rgba  = yv12_to_rgba_c;
 	yv12_to_yuv    = yv12_to_yuv_c;
 	yv12_to_yuyv   = yv12_to_yuyv_c;
 	yv12_to_uyvy   = yv12_to_uyvy_c;
@@ -282,12 +302,20 @@
 		transfer_16to8add  = transfer_16to8add_mmx;
 		transfer8x8_copy   = transfer8x8_copy_mmx;
 
+		/* Interlacing Functions */
+		MBFieldTest = MBFieldTest_mmx;
 
 		/* Image Interpolation related functions */
 		interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;
 
+		interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;
+		interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;
+
+//		interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
+		interpolate8x8_avg4 = interpolate8x8_avg4_mmx;
+
 		/* Image RGB->YV12 related functions */
 		rgb24_to_yv12 = rgb24_to_yv12_mmx;
 		rgb32_to_yv12 = rgb32_to_yv12_mmx;
@@ -348,8 +376,6 @@
 		sad8bi  = sad8bi_xmm;
 		dev16 = dev16_xmm;
 		sad16v	 = sad16v_xmm;
-		fprintf(stderr,"sad16v=XMM\n");
-
 	}
 
 	if ((cpu_flags & XVID_CPU_3DNOW) > 0) {
@@ -477,12 +503,11 @@
 {
 	switch (opt) {
 	case XVID_ENC_ENCODE:
-#ifdef BFRAMES
+
 		if (((Encoder *) handle)->mbParam.max_bframes >= 0)
 		return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1,
 							  (XVID_ENC_STATS *) param2);
 		else 
-#endif
 		return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,
 							  (XVID_ENC_STATS *) param2);