--- trunk/xvidcore/src/encoder.c	2002/03/29 04:25:16	83
+++ trunk/xvidcore/src/encoder.c	2002/04/04 13:58:18	100
@@ -170,7 +170,6 @@
 				pParam->max_quantizer, pParam->min_quantizer);
 	}
 
-	create_vlc_tables();
 	init_timer();
 
 	return XVID_ERR_OK;
@@ -188,11 +187,11 @@
 	image_destroy(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	xvid_free(pEnc);
 
-	destroy_vlc_tables();
-
 	return XVID_ERR_OK;
 }
 
@@ -241,9 +240,9 @@
 		pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y,
 							    pEnc->mbParam.width,
 							    temp_dquants,
-							    pFrame->quant,
-							    pFrame->quant,
-							    2*pFrame->quant,
+							    pEnc->mbParam.quant,
+							    pEnc->mbParam.quant,
+							    2*pEnc->mbParam.quant,
 							    pEnc->mbParam.mb_width,
 							    pEnc->mbParam.mb_height);