--- encoder.c	2010/12/24 13:20:07	1.135
+++ encoder.c	2011/02/03 15:12:34	1.135.2.4
@@ -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 2010/12/24 13:20:07 Isibaar Exp $
+ * $Id: encoder.c,v 1.135.2.4 2011/02/03 15:12:34 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -1609,7 +1609,8 @@
 		memcpy((void *)((ptr_t)bs->start + pos), 
 			   (void *)((ptr_t)pEnc->smpData[k].bs->start), len);
 
-		current->length = pos += len;
+		current->length += len;
+		pos += len;
 
 		/* collect stats */
 		current->sStat.iTextBits += pEnc->smpData[k].sStat->iTextBits;
@@ -1645,7 +1646,6 @@
 	int bound = 0, num_slices = pEnc->num_slices;
 	int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices));
 	int slices_per_thread = (num_slices*1024 / num_threads);
-	int mb_width = pEnc->mbParam.mb_width; 
 	int mb_height = pEnc->mbParam.mb_height;
 	void * status = NULL;
 	uint16_t k;
@@ -1755,7 +1755,6 @@
 	FRAMEINFO *const current = pEnc->current;
 	FRAMEINFO *const reference = pEnc->reference;
 	MBParam * const pParam = &pEnc->mbParam;
-	IMAGE *pRef = &reference->image;
 	int mb_width = pParam->mb_width;
 	int mb_height = pParam->mb_height;
 
@@ -2131,7 +2130,8 @@
 
 	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)) )
+		( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) &&
+		(current->coding_type == P_VOP) )
 	{
 		current->sStat.kblks = current->sStat.mblks = current->sStat.iTextBits = 0;
 		current->sStat.ublks = mb_width * mb_height;
@@ -2285,7 +2285,6 @@
 	IMAGE *b_ref = &pEnc->current->image;
 
 	MBParam * const pParam = &pEnc->mbParam;
-	int mb_width = pParam->mb_width;
 	int mb_height = pParam->mb_height;
 
 	#ifdef BFRAMES_DEC_DEBUG
@@ -2305,7 +2304,7 @@
 		image_setedges(f_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
 					   pEnc->mbParam.height, 0);
-		pEnc->current->is_edged = 1;	
+		pEnc->reference->is_edged = 1;
 	}
 
 	if (pEnc->reference->is_interpolated != 0) {
@@ -2336,8 +2335,8 @@
 
 	frame->coding_type = B_VOP;
 
-	if (pEnc->current->vop_flags & XVID_VOP_RD_PSNRHVSM) {
-		image_block_variance(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->current->mbs, 
+	if ((frame->vop_flags & XVID_VOP_RD_PSNRHVSM) && (frame->vop_flags & XVID_VOP_RD_BVOP)) {
+		image_block_variance(&frame->image, pEnc->mbParam.edged_width, frame->mbs, 
 		                     pEnc->mbParam.mb_width, pEnc->mbParam.mb_height);
 	}