--- trunk/xvidcore/src/quant/adapt_quant.c	2002/09/07 12:51:38	443
+++ trunk/xvidcore/src/quant/adapt_quant.c	2002/09/20 20:17:22	496
@@ -28,7 +28,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: adapt_quant.c,v 1.7 2002-09-07 12:51:38 edgomez Exp $
+ *  $Id: adapt_quant.c,v 1.9 2002-09-20 20:17:22 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -125,8 +125,10 @@
 	if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))
 		return(-1);
 
-	if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float))))
+	if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float)))) {
+		free(quant);
 		return(-1);
+	}
 
 	for (k = 0; k < mb_height; k++) {
 		for (l = 0; l < mb_width; l++)	// do this for all macroblocks individually 
@@ -168,8 +170,14 @@
 			}
 		}
 	}
+
+	i = normalize_quantizer_field(quant, intquant,
+								  mb_width * mb_height,
+								  min_quant, max_quant);
+
 	free(val);
 	free(quant);
-	return normalize_quantizer_field(quant, intquant, mb_width * mb_height,
-									 min_quant, max_quant);
+
+	return(i);
+
 }