--- xvid.c	2002/10/06 07:05:50	1.33.2.7
+++ 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.7 2002/10/06 07:05:50 suxen_drol Exp $
+ *  $Id: xvid.c,v 1.33.2.10 2002/11/02 16:11:07 chl Exp $
  *
  ****************************************************************************/
 
@@ -225,6 +225,10 @@
 	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;
@@ -309,7 +313,7 @@
 		interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;
 		interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;
 
-		interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
+//		interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
 		interpolate8x8_avg4 = interpolate8x8_avg4_mmx;
 
 		/* Image RGB->YV12 related functions */
@@ -372,8 +376,6 @@
 		sad8bi  = sad8bi_xmm;
 		dev16 = dev16_xmm;
 		sad16v	 = sad16v_xmm;
-		fprintf(stderr,"sad16v=XMM\n");
-
 	}
 
 	if ((cpu_flags & XVID_CPU_3DNOW) > 0) {
@@ -501,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);