--- encoder.c	2011/03/08 19:18:44	1.135.2.5
+++ encoder.c	2010/12/31 10:17:29	1.138
@@ -21,7 +21,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.135.2.5 2011/03/08 19:18:44 Isibaar Exp $
+ * $Id: encoder.c,v 1.138 2010/12/31 10:17:29 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -1917,7 +1917,7 @@
 	if (!reference->is_edged) {	
 		start_timer();
 		image_setedges(pRef, pParam->edged_width, pParam->edged_height,
-					   pParam->width, pParam->height, XVID_BS_VERSION);
+					   pParam->width, pParam->height, 0);
 		stop_edges_timer();
 		reference->is_edged = 1;
 	}
@@ -2130,8 +2130,7 @@
 
 	if (current->sStat.kblks + current->sStat.mblks <
 		(pParam->frame_drop_ratio * mb_width * mb_height) / 100 &&
-		( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) &&
-		(current->coding_type == P_VOP) )
+		( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) )
 	{
 		current->sStat.kblks = current->sStat.mblks = current->sStat.iTextBits = 0;
 		current->sStat.ublks = mb_width * mb_height;
@@ -2303,8 +2302,8 @@
 	if (!pEnc->reference->is_edged) {
 		image_setedges(f_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height, XVID_BS_VERSION);
-		pEnc->reference->is_edged = 1;
+					   pEnc->mbParam.height, 0);
+		pEnc->reference->is_edged = 1;	
 	}
 
 	if (pEnc->reference->is_interpolated != 0) {
@@ -2320,7 +2319,7 @@
 	if (!pEnc->current->is_edged) {
 		image_setedges(b_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height, XVID_BS_VERSION);
+					   pEnc->mbParam.height, 0);
 		pEnc->current->is_edged = 1;
 	}