--- branches/dev-api-4/xvidcore/src/encoder.c	2003/03/27 17:09:59	953
+++ branches/dev-api-4/xvidcore/src/encoder.c	2003/04/27 21:48:39	1000
@@ -26,7 +26,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: encoder.c,v 1.95.2.16 2003-03-27 17:09:48 edgomez Exp $
+ *  $Id: encoder.c,v 1.95.2.20 2003-04-27 21:48:39 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -151,11 +151,16 @@
     if (pEnc->mbParam.fincr>0)
 	    simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase);
 
-    /* plugin */
-    pEnc->num_plugins = create->num_plugins;
-    pEnc->plugins = xvid_malloc(sizeof(xvid_enc_plugin_t) * pEnc->num_plugins, CACHE_LINE);
-    if (pEnc->plugins == NULL)
-        goto xvid_err_memory0;
+    /* plugins */
+    if(create->num_plugins > 0) {
+		pEnc->num_plugins = create->num_plugins;
+		pEnc->plugins = xvid_malloc(sizeof(xvid_enc_plugin_t) * pEnc->num_plugins, CACHE_LINE);
+		if (pEnc->plugins == NULL)
+			goto xvid_err_memory0;
+	} else {
+		pEnc->num_plugins = 0;
+		pEnc->plugins = NULL;
+	}
 
     for (n=0; n<pEnc->num_plugins;n++) {
         xvid_plg_create_t pcreate;
@@ -202,8 +207,8 @@
 	pEnc->mbParam.frame_drop_ratio = MAX(create->frame_drop_ratio, 0);
 
     /* max keyframe interval */
-    pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <=0 ? 250 : create->max_key_interval;
-    /*XXX: replace 250 hard code with "10seconds * framerate" */
+    pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ?
+		10 * pEnc->mbParam.fbase / pEnc->mbParam.fincr : create->max_key_interval;
 
 	/* Bitrate allocator defaults 
 
@@ -577,6 +582,8 @@
 				  pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width,
 				  pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vGMC, pEnc->mbParam.edged_width,
+				  pEnc->mbParam.edged_height);
 
 	if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) {	
 		image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width,
@@ -598,8 +605,7 @@
     }
 
 
-    if (pEnc->num_plugins>0)
-    {
+    if (pEnc->num_plugins>0) {
         xvid_plg_destroy_t pdestroy;
         memset(&pdestroy, 0, sizeof(xvid_plg_destroy_t));
 
@@ -1353,11 +1359,16 @@
 	}
 	emms();
 
+/* XXX: Remove the two #if 0 blocks when we are sure we must always pad the stream */
+#if 0
 	/* for divx5 compatibility, we must always pad between the packed p and b frames */
 	if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0)
+#endif
 		BitstreamPadAlways(bs);
+#if 0
 	else
 		BitstreamPad(bs);
+#endif
     pEnc->current->length = (BitstreamPos(bs) - bits) / 8;
 
 	pEnc->fMvPrevSigma = -1;
@@ -1754,11 +1765,16 @@
 	} 
 	*/
 
+/* XXX: Remove the two #if 0 blocks when we are sure we must always pad the stream */
+#if 0
    	/* for divx5 compatibility, we must always pad between the packed p and b frames */
 	if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0)
+#endif
 		BitstreamPadAlways(bs);
+#if 0
 	else
 		BitstreamPad(bs);
+#endif
 
     pEnc->current->length = (BitstreamPos(bs) - bits) / 8;
 
@@ -1890,7 +1906,7 @@
 
 	/* TODO: dynamic fcode/bcode ??? */
 
-    BitstreamPad(bs);
+    BitstreamPadAlways(bs);
 	frame->length = (BitstreamPos(bs) - bits) / 8;
 
 #ifdef BFRAMES_DEC_DEBUG