--- trunk/xvidcore/src/quant/quant_matrix.c	2002/09/08 17:28:22	457
+++ trunk/xvidcore/src/quant/quant_matrix.c	2002/10/19 12:20:33	605
@@ -3,7 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Custom matrix quantization functions -
  *
- *  Copyright(C) 2002 Michael Militzer
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *               2002 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -28,7 +29,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: quant_matrix.c,v 1.8 2002-09-08 17:28:22 edgomez Exp $
+ *  $Id: quant_matrix.c,v 1.11 2002-10-19 12:20:33 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -178,7 +179,7 @@
 		intra_matrix[i] = (int16_t) matrix[i];
 		intra_matrix_fix[i] = FIX(intra_matrix[i]);
 	}
-	return custom_intra_matrix | change;
+	return /*custom_intra_matrix |*/ change;
 }
 
 
@@ -198,5 +199,5 @@
 		inter_matrix[i] = (int16_t) matrix[i];
 		inter_matrix_fix[i] = FIX(inter_matrix[i]);
 	}
-	return custom_inter_matrix | change;
+	return /*custom_inter_matrix |*/ change;
 }