--- mbprediction.c	2004/06/04 11:54:42	1.14.2.2
+++ mbprediction.c	2010/12/18 16:02:00	1.20
@@ -20,7 +20,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.c,v 1.14.2.2 2004/06/04 11:54:42 edgomez Exp $
+ * $Id: mbprediction.c,v 1.20 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -84,7 +84,7 @@
 	int *acpred_direction = &pMBs[index].acpred_directions[block];
 	uint32_t i;
 
-	left = top = diag = current = 0;
+	left = top = diag = current = NULL;
 
 	/* grab left,top and diag macroblocks */
 
@@ -94,7 +94,7 @@
 		(pMBs[index - 1].mode == MODE_INTRA ||
 		 pMBs[index - 1].mode == MODE_INTRA_Q)) {
 
-		left = pMBs[index - 1].pred_values[0];
+		left = (int16_t*)pMBs[index - 1].pred_values[0];
 		left_quant = pMBs[index - 1].quant;
 	}
 	/* top macroblock */
@@ -103,7 +103,7 @@
 		(pMBs[index - mb_width].mode == MODE_INTRA ||
 		 pMBs[index - mb_width].mode == MODE_INTRA_Q)) {
 
-		top = pMBs[index - mb_width].pred_values[0];
+		top = (int16_t*)pMBs[index - mb_width].pred_values[0];
 		top_quant = pMBs[index - mb_width].quant;
 	}
 	/* diag macroblock */
@@ -112,10 +112,10 @@
 		(pMBs[index - 1 - mb_width].mode == MODE_INTRA ||
 		 pMBs[index - 1 - mb_width].mode == MODE_INTRA_Q)) {
 
-		diag = pMBs[index - 1 - mb_width].pred_values[0];
+		diag = (int16_t*)pMBs[index - 1 - mb_width].pred_values[0];
 	}
 
-	current = pMBs[index].pred_values[0];
+	current = (int16_t*)pMBs[index].pred_values[0];
 
 	/* now grab pLeft, pTop, pDiag _blocks_ */
 
@@ -219,14 +219,14 @@
 		 const int bsversion)
 {
 	uint8_t acpred_direction = pMB->acpred_directions[block];
-	int16_t *pCurrent = pMB->pred_values[block];
+	int16_t *pCurrent = (int16_t*)pMB->pred_values[block];
 	uint32_t i;
 
 	DPRINTF(XVID_DEBUG_COEFF,"predictor[0] %i\n", predictors[0]);
 
 	dct_codes[0] += predictors[0];	/* dc prediction */
 	pCurrent[0] = dct_codes[0]*iDcScaler;
-	if (!bsversion || bsversion > BS_VERSION_BUGGY_DC_CLIPPING) {
+	if (bsversion > BS_VERSION_BUGGY_DC_CLIPPING) {
 		pCurrent[0] = CLIP(pCurrent[0], -2048, 2047);
 	}
 
@@ -270,14 +270,14 @@
 S2 = sum of all qcoeff
 */
 
-int
+static int
 calc_acdc_coeff(MACROBLOCK * pMB,
 		  uint32_t block,
 		  int16_t qcoeff[64],
 		  uint32_t iDcScaler,
 		  int16_t predictors[8])
 {
-	int16_t *pCurrent = pMB->pred_values[block];
+	int16_t *pCurrent = (int16_t*)pMB->pred_values[block];
 	uint32_t i;
 	int S1 = 0, S2 = 0;
 
@@ -327,7 +327,7 @@
 
 /* returns the bits *saved* if prediction is enabled */
 
-int
+static int
 calc_acdc_bits(MACROBLOCK * pMB,
 		  uint32_t block,
 		  int16_t qcoeff[64],
@@ -335,7 +335,7 @@
 		  int16_t predictors[8])
 {
 	const int direction = pMB->acpred_directions[block];
-	int16_t *pCurrent = pMB->pred_values[block];
+	int16_t *pCurrent = (int16_t*)pMB->pred_values[block];
 	int16_t tmp[8];
 	unsigned int i;
 	int Z1, Z2;
@@ -386,7 +386,7 @@
 
 /* apply predictors[] to qcoeff */
 
-void
+static void
 apply_acdc(MACROBLOCK * pMB,
 		   uint32_t block,
 		   int16_t qcoeff[64],
@@ -409,7 +409,8 @@
 			 uint32_t x,
 			 uint32_t y,
 			 uint32_t mb_width,
-			 int16_t qcoeff[6 * 64])
+			 int16_t qcoeff[6 * 64],
+			 const int bound)
 {
 
 	int32_t j;
@@ -426,7 +427,7 @@
 			iDcScaler = get_dc_scaler(iQuant, j<4);
 
 			predict_acdc(frame->mbs, x, y, mb_width, j, &qcoeff[j * 64],
-						 iQuant, iDcScaler, predictors[j], 0);
+						 iQuant, iDcScaler, predictors[j], bound);
 
 			if ((frame->vop_flags & XVID_VOP_HQACPRED))
 				S += calc_acdc_bits(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);
@@ -524,6 +525,85 @@
 	return pmv[last_cand];	/* no point calculating median mv */
 }
 
+VECTOR get_pmv2_interlaced(const MACROBLOCK * const mbs,
+   const int mb_width,
+   const int bound,
+   const int x,
+   const int y,
+   const int block)
+{
+  int lx, ly, lz;   /* left */
+  int tx, ty, tz;   /* top */
+  int rx, ry, rz;   /* top-right */
+  int lpos, tpos, rpos;
+  int num_cand = 0, last_cand = 1;
+
+  VECTOR pmv[4];  /* left neighbour, top neighbour, top-right neighbour */
+
+  lx=x-1; ly=y;   lz=1;
+  tx=x;   ty=y-1; tz=2;
+  rx=x+1; ry=y-1; rz=2;
+
+  lpos=lx+ly*mb_width;
+  rpos=rx+ry*mb_width;
+  tpos=tx+ty*mb_width;
+
+  if(lx>=0 && lpos>=bound) 
+  {
+    num_cand++;
+    if(mbs[lpos].field_pred)
+     pmv[1] = mbs[lpos].mvs_avg;
+    else 
+     pmv[1] = mbs[lpos].mvs[lz];
+  }
+  else 
+  {
+    pmv[1] = zeroMV;
+  }  
+
+  if(tpos>=bound) 
+  {
+    num_cand++;
+    last_cand=2;
+    if(mbs[tpos].field_pred)
+     pmv[2] = mbs[tpos].mvs_avg;
+    else
+     pmv[2] = mbs[tpos].mvs[tz];
+  } 
+  else
+  { 
+    pmv[2] = zeroMV;
+  }
+        
+  if(rx<mb_width && rpos>=bound) 
+  {
+    num_cand++;
+    last_cand = 3;
+    if(mbs[rpos].field_pred)
+     pmv[3] = mbs[rpos].mvs_avg;
+    else
+     pmv[3] = mbs[rpos].mvs[rz];
+  } 
+  else
+  { 
+    pmv[3] = zeroMV;
+  }  
+
+  /* If there're more than one candidate, we return the median vector */
+  if(num_cand>1) 
+  {
+    /* set median */
+    pmv[0].x = MIN(MAX(pmv[1].x, pmv[2].x),
+               MIN(MAX(pmv[2].x, pmv[3].x), MAX(pmv[1].x, pmv[3].x)));
+    pmv[0].y = MIN(MAX(pmv[1].y, pmv[2].y),
+               MIN(MAX(pmv[2].y, pmv[3].y), MAX(pmv[1].y, pmv[3].y)));
+          
+    return pmv[0];
+  }
+
+  return pmv[last_cand];  /* no point calculating median mv */
+}
+
 VECTOR
 get_qpmv2(const MACROBLOCK * const mbs,
 		const int mb_width,