--- quant_mpeg4.c	2003/02/15 15:22:19	1.9
+++ quant_mpeg4.c	2003/06/09 13:55:25	1.9.2.2
@@ -1,50 +1,33 @@
-/**************************************************************************
+/*****************************************************************************
  *
- *    XVID MPEG-4 VIDEO CODEC
- *    mpeg-4 quantization/dequantization
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - MPEG4 Quantization related header  -
  *
- *    This program is an implementation of a part of one or more MPEG-4
- *    Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *    to use this software module in hardware or software products are
- *    advised that its use may infringe existing patents or copyrights, and
- *    any such use would be at such party's own risk.  The original
- *    developer of this software module and his/her company, and subsequent
- *    editors and their companies, will have no liability for use of this
- *    software or modifications or derivatives thereof.
- *
- *    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.
- *
- *    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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *************************************************************************/
-
-/**************************************************************************
- *
- *    History:
- *
- *	26.01.2002    fixed  quant4_intra dcscalar signed/unsigned error
- *  20.01.2002    increased accuracy of >> divide
- *  26.12.2001    divide-by-multiplication optimization
- *  22.12.2001    [-127,127] clamping removed; minor tweaks
- *	19.11.2001    inital version <pross@cs.rmit.edu.au>
+ *  Copyright(C) 2001-2003 Peter Ross <pross@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
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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: quant_mpeg4.c,v 1.9.2.2 2003/06/09 13:55:25 edgomez Exp $
+ *
+ ****************************************************************************/
 
 #include "../global.h"
 #include "quant_mpeg4.h"
 #include "quant_matrix.h"
 
-// function pointers
+/* function pointers */
 quant_intraFuncPtr quant4_intra;
 quant_intraFuncPtr dequant4_intra;
 dequant_interFuncPtr dequant4_inter;
@@ -55,8 +38,10 @@
 #define VM18Q    4
 
 
-// divide-by-multiply table
-// need 17 bit shift (16 causes slight errors when q > 19)
+/*
+ * divide-by-multiply table
+ * need 17 bit shift (16 causes slight errors when q > 19)
+ */
 
 #define SCALEBITS    17
 #define FIX(X)        ((1UL << SCALEBITS) / (X) + 1)
@@ -72,13 +57,12 @@
 	FIX(56), FIX(58), FIX(60), FIX(62)
 };
 
-/*    quantize intra-block
-
-    // const int32_t quantd = DIV_DIV(VM18P*quant, VM18Q);
-    //
-    // level = DIV_DIV(16 * data[i], default_intra_matrix[i]);
-    // coeff[i] = (level + quantd) / quant2;
-*/
+/* quantize intra-block
+ *
+ * const int32_t quantd = DIV_DIV(VM18P*quant, VM18Q);
+ * level = DIV_DIV(16 * data[i], default_intra_matrix[i]);
+ * coeff[i] = (level + quantd) / quant2;
+ */
 
 void
 quant4_intra_c(int16_t * coeff,
@@ -116,9 +100,11 @@
 
 
 
-/*    dequantize intra-block & clamp to [-2048,2047]
-    // data[i] = (coeff[i] * default_intra_matrix[i] * quant2) >> 4;
-*/
+/*
+ * dequantize intra-block & clamp to [-2048,2047]
+ *
+ * data[i] = (coeff[i] * default_intra_matrix[i] * quant2) >> 4;
+ */
 
 void
 dequant4_intra_c(int16_t * data,
@@ -146,7 +132,7 @@
 
 			level = (level * intra_matrix[i] * quant) >> 3;
 			data[i] = (level <= 2048 ? -(int16_t) level : -2048);
-		} else					// if (coeff[i] > 0)
+		} else					/* if (coeff[i] > 0) */
 		{
 			uint32_t level = coeff[i];
 
@@ -158,11 +144,11 @@
 
 
 
-/*    quantize inter-block
-
-    // level = DIV_DIV(16 * data[i], default_intra_matrix[i]);
-    // coeff[i] = (level + quantd) / quant2;
-    // sum += abs(level);
+/* quantize inter-block
+ *
+ * level = DIV_DIV(16 * data[i], default_intra_matrix[i]);
+ * coeff[i] = (level + quantd) / quant2;
+ * sum += abs(level);
 */
 
 uint32_t
@@ -224,7 +210,7 @@
 
 			level = ((2 * level + 1) * inter_matrix[i] * quant) >> 4;
 			data[i] = (level <= 2048 ? -level : -2048);
-		} else					// if (coeff[i] > 0)
+		} else					/* if (coeff[i] > 0) */
 		{
 			uint32_t level = coeff[i];
 
@@ -235,7 +221,7 @@
 		sum ^= data[i];
 	}
 
-	// mismatch control
+	/*  mismatch control */
 
 	if ((sum & 1) == 0) {
 		data[63] ^= 1;