--- xvid.c	2004/10/17 10:20:15	1.56
+++ xvid.c	2004/12/19 13:16:50	1.59
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid.c,v 1.56 2004/10/17 10:20:15 edgomez Exp $
+ * $Id: xvid.c,v 1.59 2004/12/19 13:16:50 syskin Exp $
  *
  ****************************************************************************/
 
@@ -36,7 +36,6 @@
 #include "dct/fdct.h"
 #include "image/colorspace.h"
 #include "image/interpolate8x8.h"
-#include "image/reduced.h"
 #include "utils/mem_transfer.h"
 #include "utils/mbfunctions.h"
 #include "quant/quant.h"
@@ -211,6 +210,7 @@
 	transfer_8to16sub  = transfer_8to16sub_c;
 	transfer_8to16subro  = transfer_8to16subro_c;
 	transfer_8to16sub2 = transfer_8to16sub2_c;
+	transfer_8to16sub2ro = transfer_8to16sub2ro_c;
 	transfer_16to8add  = transfer_16to8add_c;
 	transfer8x8_copy   = transfer8x8_copy_c;
 
@@ -244,14 +244,6 @@
 	/* postprocessing */
 	image_brightness = image_brightness_c;
 
-	/* reduced resolution */
-	copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C;
-	add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C;
-	vfilter_31 = xvid_VFilter_31_C;
-	hfilter_31 = xvid_HFilter_31_C;
-	filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_C;
-	filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_C;
-
 	/* Initialize internal colorspace transformation tables */
 	colorspace_init();
 
@@ -311,11 +303,6 @@
 
 #if defined(ARCH_IS_IA32)
 
-	if ((cpu_flags & XVID_CPU_ASM))	{
-		vfilter_31 = xvid_VFilter_31_x86;
-		hfilter_31 = xvid_HFilter_31_x86;
-	}
-
 	if ((cpu_flags & XVID_CPU_MMX) || (cpu_flags & XVID_CPU_MMXEXT) ||
 		(cpu_flags & XVID_CPU_3DNOW) || (cpu_flags & XVID_CPU_3DNOWEXT) ||
 		(cpu_flags & XVID_CPU_SSE) || (cpu_flags & XVID_CPU_SSE2))
@@ -376,13 +363,6 @@
 		/* postprocessing */
 		image_brightness = image_brightness_mmx;
 
-		/* reduced resolution */
-		copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx;
-		add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx;
-		hfilter_31 = xvid_HFilter_31_mmx;
-		filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_mmx;
-		filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_mmx;
-
 		/* image input xxx_to_yv12 related functions */
 		yv12_to_yv12  = yv12_to_yv12_mmx;
 		bgr_to_yv12   = bgr_to_yv12_mmx;
@@ -441,10 +421,6 @@
 		interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;
 		interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_xmm;
 
-		/* reduced resolution */
-		copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_xmm;
-		add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm;
-
 		/* Quantization */
 		quant_mpeg_intra = quant_mpeg_intra_xmm;
 		quant_mpeg_inter = quant_mpeg_inter_xmm;
@@ -454,6 +430,7 @@
 
 		/* Buffer transfer */
 		transfer_8to16sub2 = transfer_8to16sub2_xmm;
+		transfer_8to16sub2ro = transfer_8to16sub2ro_xmm;
 
 		/* Colorspace transformation */
 		yv12_to_yv12  = yv12_to_yv12_xmm;
@@ -593,7 +570,7 @@
           interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_altivec_c;
           interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_altivec_c;
           interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_altivec_c;
-          
+		  
           interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;
           interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;