--- mbfunctions.h	2002/09/25 16:51:05	1.10.2.1
+++ mbfunctions.h	2003/03/10 00:38:49	1.17.2.1
@@ -42,20 +42,24 @@
 
 
 /** MBMotionCompensation **/
-void MBMotionCompensation(MACROBLOCK * const pMB,
-						  const uint32_t j,
-						  const uint32_t i,
-						  const IMAGE * const pRef,
-						  const IMAGE * const pRefH,
-						  const IMAGE * const pRefV,
-						  const IMAGE * const pRefHV,
-						  IMAGE * const pCurrent,
-						  int16_t dct_codes[6 * 64],
-						  const uint32_t width,
-						  const uint32_t height,
-						  const uint32_t edged_width,
-						  const uint32_t rounding);
 
+void
+MBMotionCompensation(MACROBLOCK * const mb,
+					 const uint32_t i,
+					 const uint32_t j,
+					 const IMAGE * const ref,
+					 const IMAGE * const refh,
+					 const IMAGE * const refv,
+					 const IMAGE * const refhv,
+					 const IMAGE * const refGMC,
+					 IMAGE * const cur,
+					 int16_t * dct_codes,
+					 const uint32_t width,
+					 const uint32_t height,
+					 const uint32_t edged_width,
+					 const int32_t quarterpel,
+					 const int reduced_resolution,
+					 const int32_t rounding);
 
 /** MBTransQuant.c **/
 
@@ -106,6 +110,8 @@
 uint8_t MBTransQuantInterBVOP(const MBParam * pParam,
 						  FRAMEINFO * frame,
 						  MACROBLOCK * pMB,
+						  const uint32_t x_pos,
+						  const uint32_t y_pos,
 						  int16_t data[6 * 64],
 						  int16_t qcoeff[6 * 64]);
 
@@ -184,10 +190,10 @@
 
 /** MBCoding.c **/
 
-void MBSkip(Bitstream * bs);  /* just the bitstream. Since MB is skipped, no info is needed */
+/* void MBSkip(Bitstream * bs);  just the bitstream. Since MB is skipped, no info is needed */
 
 
-void MBCoding(const FRAMEINFO * frame,	/* <-- the parameter for coding of the bitstream */
+void MBCoding(const FRAMEINFO * const frame,	/* <-- the parameter for coding of the bitstream */
 
 			  MACROBLOCK * pMB,	/* <-- Info of the MB to be coded */