--- mbfunctions.h	2003/06/09 13:55:34	1.17.2.4
+++ mbfunctions.h	2003/03/22 14:04:48	1.18
@@ -1,27 +1,16 @@
-/*****************************************************************************
+/**************************************************************************
  *
- *  XVID MPEG-4 VIDEO CODEC
- *  - MB related header  -
+ *  Modifications:
  *
- *  Copyright(C) 2001 Michael Militzer <isibaar@videocoding.de>
+ *  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()
  *
- *  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.
+ *  Michael Militzer <isibaar@videocoding.de>
  *
- *  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.4 2003/06/09 13:55:34 edgomez Exp $
- *
- ****************************************************************************/
+ **************************************************************************/
 
 #ifndef _ENCORE_BLOCK_H
 #define _ENCORE_BLOCK_H
@@ -63,7 +52,7 @@
 
 
 void MBTransQuantIntra(const MBParam * const pParam,
-					const FRAMEINFO * const frame,
+					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 */
@@ -71,7 +60,7 @@
 					int16_t qcoeff[6 * 64]);	/* <-> the quantized DCT coefficients */
 
 uint8_t MBTransQuantInter(const MBParam * const pParam,
-						const FRAMEINFO * const frame,
+						FRAMEINFO * const frame,
 						MACROBLOCK * const pMB,
 						const uint32_t x_pos,
 						const uint32_t y_pos,
@@ -79,13 +68,15 @@
 						int16_t qcoeff[6 * 64]);
 
 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]);
+						FRAMEINFO * frame,
+						MACROBLOCK * pMB,
+						int16_t data[6 * 64],
+						int16_t qcoeff[6 * 64]);
+
+/** interlacing **/
 
+uint32_t MBDecideFieldDCT(int16_t data[6 * 64]);	/* <- decide whether to use field-based DCT
+														for interlacing */
 
 typedef uint32_t (MBFIELDTEST) (int16_t data[6 * 64]);	/* function pointer for field test */
 typedef MBFIELDTEST *MBFIELDTEST_PTR;