--- trunk/xvidcore/src/quant/quant_matrix.c	2002/06/12 20:38:41	195
+++ trunk/xvidcore/src/quant/quant_matrix.c	2002/11/17 00:41:20	653
@@ -1,7 +1,69 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Custom matrix quantization functions -
+ *
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *               2002 Peter Ross <pross@xvid.org>
+ *
+ *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+ *
+ *  XviD 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
+ *
+ *  Under section 8 of the GNU General Public License, the copyright
+ *  holders of XVID explicitly forbid distribution in the following
+ *  countries:
+ *
+ *    - Japan
+ *    - United States of America
+ *
+ *  Linking XviD statically or dynamically with other modules is making a
+ *  combined work based on XviD.  Thus, the terms and conditions of the
+ *  GNU General Public License cover the whole combination.
+ *
+ *  As a special exception, the copyright holders of XviD give you
+ *  permission to link XviD with independent modules that communicate with
+ *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
+ *  license terms of these independent modules, and to copy and distribute
+ *  the resulting combined work under terms of your choice, provided that
+ *  every copy of the combined work is accompanied by a complete copy of
+ *  the source code of XviD (the version of XviD used to produce the
+ *  combined work), being distributed under the terms of the GNU General
+ *  Public License plus this exception.  An independent module is a module
+ *  which is not derived from or based on XviD.
+ *
+ *  Note that people who make modified versions of XviD are not obligated
+ *  to grant this special exception for their modified versions; it is
+ *  their choice whether to do so.  The GNU General Public License gives
+ *  permission to release a modified version without this exception; this
+ *  exception also makes it possible to release a modified version which
+ *  carries forward this exception.
+ *
+ * $Id: quant_matrix.c,v 1.12 2002-11-17 00:41:19 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #include "quant_matrix.h"
 
 #define FIX(X) (1 << 16) / (X) + 1
 
+/*****************************************************************************
+ * Local data
+ ****************************************************************************/
+
+/* ToDo : remove all this local to make this module thread safe */
 uint8_t custom_intra_matrix = 0;
 uint8_t custom_inter_matrix = 0;
 
@@ -71,6 +133,10 @@
 	FIX(23), FIX(24), FIX(25), FIX(27), FIX(28), FIX(30), FIX(31), FIX(33)
 };
 
+/*****************************************************************************
+ * Functions
+ ****************************************************************************/
+
 uint8_t
 get_intra_matrix_status(void)
 {
@@ -135,7 +201,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;
 }
 
 
@@ -155,5 +221,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;
 }