--- reduced.h	2002/12/08 05:50:58	1.1.2.1
+++ reduced.h	2002/12/10 11:13:50	1.1.2.4
@@ -3,15 +3,18 @@
 
 #include "../portab.h"
 
-/* decoding prototypes */
-
+/* decoding */
 typedef void (COPY_UPSAMPLED_8X8_16TO8) (uint8_t *Dst, const int16_t *Src, const int BpS);
 typedef void (ADD_UPSAMPLED_8X8_16TO8) (uint8_t *Dst, const int16_t *Src, const int BpS);
 
-/* Note: "Nb"_Blks is the number of 8-pixels blocks to process */
+/* deblocking: Note: "Nb"_Blks is the number of 8-pixels blocks to process */
 typedef void HFILTER_31(uint8_t *Src1, uint8_t *Src2, int Nb_Blks);
 typedef void VFILTER_31(uint8_t *Src1, uint8_t *Src2, const int BpS, int Nb_Blks);
 
+/* encoding: WARNING! These read 1 pixel outside of the input 16x16 block! */
+typedef void FILTER_18X18_TO_8X8(int16_t *Dst, const uint8_t *Src, const int BpS);
+typedef void FILTER_DIFF_18X18_TO_8X8(int16_t *Dst, const uint8_t *Src, const int BpS);
+
 
 extern COPY_UPSAMPLED_8X8_16TO8 * copy_upsampled_8x8_16to8;
 extern COPY_UPSAMPLED_8X8_16TO8 xvid_Copy_Upsampled_8x8_16To8_C;
@@ -32,17 +35,16 @@
 extern HFILTER_31 xvid_HFilter_31_x86;
 extern HFILTER_31 xvid_HFilter_31_mmx;
 
+extern FILTER_18X18_TO_8X8 * filter_18x18_to_8x8;
+extern FILTER_18X18_TO_8X8 xvid_Filter_18x18_To_8x8_C;
+extern FILTER_18X18_TO_8X8 xvid_Filter_18x18_To_8x8_mmx;
 
+extern FILTER_DIFF_18X18_TO_8X8 * filter_diff_18x18_to_8x8;
+extern FILTER_DIFF_18X18_TO_8X8 xvid_Filter_Diff_18x18_To_8x8_C;
+extern FILTER_DIFF_18X18_TO_8X8 xvid_Filter_Diff_18x18_To_8x8_mmx;
 
 
-  /* encoding prototypes */
-  /* WARNING! These read 1 pixel outside of the input 16x16 block! */
-extern void xvid_Filter_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS);
-extern void xvid_Filter_Diff_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS);
-
-  /* MMX version */
-extern void xvid_Filter_18x18_To_8x8_mmx(int16_t *Dst, const uint8_t *Src, const int BpS);
-extern void xvid_Filter_Diff_18x18_To_8x8_mmx(int16_t *Dst, const uint8_t *Src, const int BpS);
-
+/* rrv motion vector scale-up */
+#define RRV_MV_SCALEUP(a)	( (a)>0 ? 2*(a)-1 : (a)<0 ? 2*(a)+1 : (a) )
 
-#endif /* _REDUCED_H_ */
\ No newline at end of file
+#endif /* _REDUCED_H_ */