--- trunk/xvidcore/src/prediction/mbprediction.c	2002/11/17 00:35:33	652
+++ trunk/xvidcore/src/prediction/mbprediction.c	2002/11/26 23:44:11	677
@@ -51,7 +51,7 @@
  *  exception also makes it possible to release a modified version which
  *  carries forward this exception.
  *
- * $Id: mbprediction.c,v 1.10 2002-11-17 00:35:33 edgomez Exp $
+ * $Id: mbprediction.c,v 1.11 2002-11-26 23:44:11 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -123,15 +123,15 @@
 	const int16_t *pTop = default_acdc_values;
 	const int16_t *pDiag = default_acdc_values;
 
-	uint32_t index = x + y * mb_width;	// current macroblock
+	uint32_t index = x + y * mb_width;	/* current macroblock */
 	int *acpred_direction = &pMBs[index].acpred_directions[block];
 	uint32_t i;
 
 	left = top = diag = current = 0;
 
-	// grab left,top and diag macroblocks
+	/* grab left,top and diag macroblocks */
 
-	// left macroblock 
+	/* left macroblock  */
 
 	if (x && mbpos >= bound + 1  &&
 		(pMBs[index - 1].mode == MODE_INTRA ||
@@ -139,9 +139,9 @@
 
 		left = pMBs[index - 1].pred_values[0];
 		left_quant = pMBs[index - 1].quant;
-		//DEBUGI("LEFT", *(left+MBPRED_SIZE));
+		/*DEBUGI("LEFT", *(left+MBPRED_SIZE)); */
 	}
-	// top macroblock
+	/* top macroblock */
 
 	if (mbpos >= bound + (int)mb_width &&
 		(pMBs[index - mb_width].mode == MODE_INTRA ||
@@ -150,7 +150,7 @@
 		top = pMBs[index - mb_width].pred_values[0];
 		top_quant = pMBs[index - mb_width].quant;
 	}
-	// diag macroblock 
+	/* diag macroblock  */
 
 	if (x && mbpos >= bound + (int)mb_width + 1 &&
 		(pMBs[index - 1 - mb_width].mode == MODE_INTRA ||
@@ -161,7 +161,7 @@
 
 	current = pMBs[index].pred_values[0];
 
-	// now grab pLeft, pTop, pDiag _blocks_ 
+	/* now grab pLeft, pTop, pDiag _blocks_  */
 
 	switch (block) {
 
@@ -228,17 +228,17 @@
 		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 */
 
 	if (ABS(pLeft[0] - pDiag[0]) < ABS(pDiag[0] - pTop[0])) {
-		*acpred_direction = 1;	// vertical
+		*acpred_direction = 1;	/* vertical */
 		predictors[0] = DIV_DIV(pTop[0], iDcScaler);
 		for (i = 1; i < 8; i++) {
 			predictors[i] = rescale(top_quant, current_quant, pTop[i]);
 		}
 	} else {
-		*acpred_direction = 2;	// horizontal
+		*acpred_direction = 2;	/* horizontal */
 		predictors[0] = DIV_DIV(pLeft[0], iDcScaler);
 		for (i = 1; i < 8; i++) {
 			predictors[i] = rescale(left_quant, current_quant, pLeft[i + 7]);
@@ -265,7 +265,7 @@
 
 	DPRINTF(DPRINTF_COEFF,"predictor[0] %i", predictors[0]);
 
-	dct_codes[0] += predictors[0];	// dc prediction
+	dct_codes[0] += predictors[0];	/* dc prediction */
 	pCurrent[0] = dct_codes[0] * iDcScaler;
 
 	if (acpred_direction == 1) {
@@ -297,8 +297,8 @@
 
 
 
-// ******************************************************************
-// ******************************************************************
+/* ****************************************************************** */
+/* ****************************************************************** */
 
 /* encoder: subtract predictors from qcoeff[] and calculate S1/S2
 
@@ -344,7 +344,7 @@
 			S1 += ABS(level);
 			predictors[i] = level;
 		}
-	} else						// acpred_direction == 2
+	} else						/* acpred_direction == 2 */
 	{
 		for (i = 1; i < 8; i++) {
 			int16_t level;
@@ -412,7 +412,7 @@
 
 		}
 
-		if (S < 0)				// dont predict
+		if (S < 0)				/* dont predict */
 		{
 			for (j = 0; j < 6; j++) {
 				pMB->acpred_directions[j] = 0;