--- trunk/xvidcore/src/quant/adapt_quant.c	2002/10/19 12:20:33	605
+++ trunk/xvidcore/src/quant/adapt_quant.c	2003/02/15 15:22:19	851
@@ -1,50 +1,11 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Adaptive quantization functions -
- *
- *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
- *               2002 Christoph Lampert <gruel@web.de>
- *
- *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- *  $Id: adapt_quant.c,v 1.11 2002-10-19 12:20:33 edgomez Exp $
- *
- ****************************************************************************/
-
 #include "../portab.h"
+#include "../global.h"
 #include "adapt_quant.h"
 
 #include <stdlib.h>				/* free, malloc */
 
-#define MAX(a,b)      (((a) > (b)) ? (a) : (b))
 #define RDIFF(a,b)    ((int)(a+0.5)-(int)(b+0.5))
 
-/*****************************************************************************
- * Functions
- ****************************************************************************/
-
 int
 normalize_quantizer_field(float *in,
 						  int *out,
@@ -126,10 +87,8 @@
 	if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))
 		return(-1);
 
-	if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float)))) {
-		free(quant);
+	if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float))))
 		return(-1);
-	}
 
 	for (k = 0; k < mb_height; k++) {
 		for (l = 0; l < mb_width; l++)	// do this for all macroblocks individually