--- branches/release-1_0-branch/xvidcore/src/prediction/mbprediction.c	2004/03/22 23:56:55	1387
+++ branches/release-1_0-branch/xvidcore/src/prediction/mbprediction.c	2004/05/03 23:28:29	1446
@@ -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 2004-03-22 22:36:24 edgomez Exp $
+ * $Id: mbprediction.c,v 1.14.2.1 2004-05-03 23:28:29 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -67,7 +67,8 @@
 			 uint32_t current_quant,
 			 int32_t iDcScaler,
 			 int16_t predictors[8],
-			const int bound)
+			 const int bound,
+			 const int bsversion)
 
 {
 	const int mbpos = (y * mb_width) + x;
@@ -184,20 +185,26 @@
 		break;
 	}
 
-	/*
-	 * determine ac prediction direction & ac/dc predictor place rescaled ac/dc
-	 * predictions into predictors[] for later use
-	 */
-
+	/* determine ac prediction direction & ac/dc predictor place rescaled ac/dc
+	 * predictions into predictors[] for later use */
+	
+	/* Workaround: Bitstream versions <= 32 used to have a wrong predictor
+	 * stored as it wasn't clipped to the [-2048, 2047] range. We only
+	 * use the right predictors for bs versions > 32 */
+#define BUGGY_CLIPPING_BS_VERSION 32
 	if (abs(pLeft[0] - pDiag[0]) < abs(pDiag[0] - pTop[0])) {
 		*acpred_direction = 1;	/* vertical */
 		predictors[0] = DIV_DIV(pTop[0], iDcScaler);
+		if (bsversion == 0 || bsversion > BUGGY_CLIPPING_BS_VERSION)
+			predictors[0] = CLIP(predictors[0], -2048, 2047);
 		for (i = 1; i < 8; i++) {
 			predictors[i] = rescale(top_quant, current_quant, pTop[i]);
 		}
 	} else {
 		*acpred_direction = 2;	/* horizontal */
 		predictors[0] = DIV_DIV(pLeft[0], iDcScaler);
+		if (bsversion == 0 || bsversion > BUGGY_CLIPPING_BS_VERSION)
+			predictors[0] = CLIP(predictors[0], -2048, 2047);
 		for (i = 1; i < 8; i++) {
 			predictors[i] = rescale(left_quant, current_quant, pLeft[i + 7]);
 		}
@@ -420,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], 0, 0);
 
 			if ((frame->vop_flags & XVID_VOP_HQACPRED))
 				S += calc_acdc_bits(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);