--- xvid.c	2002/10/05 21:33:39	1.33.2.6
+++ xvid.c	2002/09/04 22:07:07	1.34
@@ -3,6 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Native API implementation  -
  *
+ *  Copyright(C) 2001-2002 Peter Ross <pross@cs.rmit.edu.au>
+ *
  *  This program is an implementation of a part of one or more MPEG-4
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
  *  to use this software module in hardware or software products are
@@ -28,19 +30,6 @@
  *
  ****************************************************************************/
 
-/*****************************************************************************
- *
- *  History
- *
- *	- 23.06.2002	added XVID_CPU_CHKONLY
- *  - 17.03.2002	Added interpolate8x8_halfpel_hv_xmm
- *  - 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.6 2002/10/05 21:33:39 Isibaar Exp $
- *
- ****************************************************************************/
-
 #include "xvid.h"
 #include "decoder.h"
 #include "encoder.h"
@@ -50,7 +39,6 @@
 #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"
@@ -82,12 +70,12 @@
 
 
 /*
-calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled
-return values:
--1 : could not determine
-0  : SIGILL was *not* signalled
-1  : SIGILL was signalled
-*/
+ * Calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled
+ * Return values:
+ * -1 : could not determine
+ * 0  : SIGILL was *not* signalled
+ * 1  : SIGILL was signalled
+ */
 
 int
 sigill_check(void (*func)())
@@ -217,24 +205,11 @@
 	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;
 
-	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();
 
@@ -263,9 +238,8 @@
 	sad16bi  = sad16bi_c;
 	sad8bi   = sad8bi_c;
 	dev16    = dev16_c;
-	sad16v	 = sad16v_c;
 	
-//	Halfpel8_Refine = Halfpel8_Refine_c;
+	Halfpel8_Refine = Halfpel8_Refine_c;
 
 #ifdef ARCH_X86
 	if ((cpu_flags & XVID_CPU_MMX) > 0) {
@@ -296,20 +270,12 @@
 		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;
@@ -330,7 +296,6 @@
 		sad16bi = sad16bi_mmx;
 		sad8bi  = sad8bi_mmx;
 		dev16    = dev16_mmx;
-		sad16v	 = sad16v_mmx;
 
 	}
 
@@ -369,8 +334,6 @@
 		sad16bi = sad16bi_xmm;
 		sad8bi  = sad8bi_xmm;
 		dev16 = dev16_xmm;
-		sad16v	 = sad16v_xmm;
-		fprintf(stderr,"sad16v=XMM\n");
 
 	}
 
@@ -417,7 +380,7 @@
 	  sad16bi = sad16bi_ia64;
 	  sad8 = sad8_ia64;
 	  dev16 = dev16_ia64;
-//	  Halfpel8_Refine = Halfpel8_Refine_ia64;
+	  Halfpel8_Refine = Halfpel8_Refine_ia64;
 	  quant_intra = quant_intra_ia64;
 	  dequant_intra = dequant_intra_ia64;
 	  quant_inter = quant_inter_ia64;