--- mbprediction.h	2004/05/21 14:40:15	1.23
+++ mbprediction.h	2010/12/18 16:02:00	1.26
@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Prediction header -
  *
- *  Copyright(C) 2002-2003 xvid team <xvid-devel@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <michael@xvid.org>
  *
  *  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
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: mbprediction.h,v 1.23 2004/05/21 14:40:15 edgomez Exp $
+ * $Id: mbprediction.h,v 1.26 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -43,13 +43,15 @@
 				uint32_t x_pos,	/* <-- The x position of the MB to be searched	*/
 				uint32_t y_pos,	/* <-- The y position of the MB to be searched	*/
 				uint32_t x_dim,	/* <-- Number of macroblocks in a row		*/
-				int16_t * qcoeff);	/* <-> The quantized DCT coefficients	*/
+				int16_t * qcoeff,	/* <-> The quantized DCT coefficients	*/
+				const int bound);
 
 void add_acdc(MACROBLOCK * pMB,
 			uint32_t block,
 			int16_t dct_codes[64],
 			uint32_t iDcScaler,
-			int16_t predictors[8]);
+			int16_t predictors[8],
+			const int bsversion);
 
 void predict_acdc(MACROBLOCK * pMBs,
 				uint32_t x,
@@ -60,8 +62,7 @@
 				uint32_t current_quant,
 				int32_t iDcScaler,
 				int16_t predictors[8],
-				const int bound,
-				const int bsversion);
+				const int bound);
 
 VECTOR
 get_pmv2(const MACROBLOCK * const mbs,
@@ -72,6 +73,14 @@
 		const int block);
 
 VECTOR
+get_pmv2_interlaced(const MACROBLOCK * const mbs,
+		const int mb_width,
+		const int bound,
+		const int x,
+		const int y,
+		const int block);
+
+VECTOR
 get_qpmv2(const MACROBLOCK * const mbs,
 		const int mb_width,
 		const int bound,