--- adapt_quant.c	2002/06/12 20:38:40	1.3
+++ adapt_quant.c	2002/09/21 03:46:45	1.6.2.1
@@ -65,7 +65,7 @@
 {
 	int i, j, k, l;
 
-	static float *quant;
+	float *quant;
 	unsigned char *ptr;
 	float *val;
 	float global = 0.;
@@ -84,11 +84,11 @@
 	const float LowerLimit = 25;
 
 
-	if (!quant)
-		if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))
-			return -1;
+	if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))
+		return(-1);
 
-	val = (float *) malloc(mb_width * mb_height * sizeof(float));
+	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 
@@ -130,7 +130,14 @@
 			}
 		}
 	}
+
+	i = normalize_quantizer_field(quant, intquant,
+								  mb_width * mb_height,
+								  min_quant, max_quant);
+
 	free(val);
-	return normalize_quantizer_field(quant, intquant, mb_width * mb_height,
-									 min_quant, max_quant);
+	free(quant);
+
+	return(i);
+
 }