--- xvid.c	2002/11/20 19:52:32	1.33.2.14
+++ xvid.c	2002/12/09 10:47:05	1.33.2.17
@@ -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.14 2002/11/20 19:52:32 Isibaar Exp $
+ *  $Id: xvid.c,v 1.33.2.17 2002/12/09 10:47:05 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -49,6 +49,7 @@
 #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_h263.h"
@@ -234,6 +235,20 @@
 	interpolate8x8_avg2 = interpolate8x8_avg2_c;
 	interpolate8x8_avg4 = interpolate8x8_avg4_c;
 
+	/* reduced resoltuion */
+
+	copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C;
+	add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C;
+#ifdef ARCH_X86
+	vfilter_31 = xvid_VFilter_31_x86;
+	hfilter_31 = xvid_HFilter_31_x86;
+#else
+	vfilter_31 = xvid_VFilter_31_C;
+	hfilter_31 = xvid_HFilter_31_C;
+#endif
+	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();
 
@@ -337,6 +352,13 @@
 		interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
 		interpolate8x8_avg4 = interpolate8x8_avg4_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;
@@ -386,6 +408,10 @@
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
 
+		/* reduced resolution */
+		copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_xmm;
+		add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm;
+
 		/* Quantization */
 		dequant_intra = dequant_intra_xmm;
 		dequant_inter = dequant_inter_xmm;
@@ -487,7 +513,7 @@
 static int
 xvid_init_convert(XVID_INIT_CONVERTINFO* convert)
 {
-	const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
+	// const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
 	const int width = convert->width;
 	const int height = convert->height;
 	const int width2 = convert->width/2;