--- mbfunctions.h	2003/03/30 13:16:42	1.17.2.2
+++ mbfunctions.h	2003/06/28 15:48:08	1.17.2.5
@@ -1,16 +1,27 @@
-/**************************************************************************
+/*****************************************************************************
  *
- *  Modifications:
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - MB related header  -
  *
- *  29.03.2002 removed MBFieldToFrame - no longer used (transfers instead)
- *  26.03.2002 interlacing support
- *  02.12.2001 motion estimation/compensation split
- *  16.11.2001 const/uint32_t changes to MBMotionEstComp()
- *  26.08.2001 added inter4v_mode parameter to MBMotionEstComp()
+ *  Copyright(C) 2001 Michael Militzer <isibaar@videocoding.de>
  *
- *  Michael Militzer <isibaar@videocoding.de>
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- **************************************************************************/
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * $Id: mbfunctions.h,v 1.17.2.5 2003/06/28 15:48:08 chl Exp $
+ *
+ ****************************************************************************/
 
 #ifndef _ENCORE_BLOCK_H
 #define _ENCORE_BLOCK_H
@@ -26,8 +37,53 @@
 					const IMAGE * const pRefH,
 					const IMAGE * const pRefV,
 					const IMAGE * const pRefHV,
+					const IMAGE * const pGMC,
 					const uint32_t iLimit);
 
+
+
+void
+GMEanalysis(const MBParam * const pParam,
+			const FRAMEINFO * const current,
+			const FRAMEINFO * const reference,
+			const IMAGE * const pRefH,
+			const IMAGE * const pRefV,
+			const IMAGE * const pRefHV);
+
+WARPPOINTS
+GlobalMotionEst(MACROBLOCK * const pMBs,
+				const MBParam * const pParam,
+				const FRAMEINFO * const current,
+				const FRAMEINFO * const reference,
+				const IMAGE * const pRefH,
+				const IMAGE * const pRefV,
+				const IMAGE * const pRefHV);
+
+int
+GlobalMotionEstRefine(
+				WARPPOINTS *const startwp,
+				MACROBLOCK * const pMBs,
+				const MBParam * const pParam,
+				const FRAMEINFO * const current,
+				const FRAMEINFO * const reference,
+				const IMAGE * const pCurr,
+				const IMAGE * const pRef,
+				const IMAGE * const pRefH,
+				const IMAGE * const pRefV,
+				const IMAGE * const pRefHV);
+
+int
+globalSAD(const WARPPOINTS *const wp, 
+		  const MBParam * const pParam, 
+		  const MACROBLOCK * const pMBs,
+		  const FRAMEINFO * const current,
+		  const IMAGE * const pRef,
+		  const IMAGE * const pCurr,
+		  uint8_t *const GMCblock);
+
+
+
+
 /** MBMotionCompensation **/
 
 void
@@ -52,7 +108,7 @@
 
 
 void MBTransQuantIntra(const MBParam * const pParam,
-					FRAMEINFO * const frame,
+					const FRAMEINFO * const frame,
 					MACROBLOCK * const pMB,
 					const uint32_t x_pos,	/* <-- The x position of the MB to be searched */
 					const uint32_t y_pos,	/* <-- The y position of the MB to be searched */
@@ -60,7 +116,7 @@
 					int16_t qcoeff[6 * 64]);	/* <-> the quantized DCT coefficients */
 
 uint8_t MBTransQuantInter(const MBParam * const pParam,
-						FRAMEINFO * const frame,
+						const FRAMEINFO * const frame,
 						MACROBLOCK * const pMB,
 						const uint32_t x_pos,
 						const uint32_t y_pos,