--- trunk/xvidcore/src/bitstream/mbcoding.c	2002/07/24 19:34:14	335
+++ trunk/xvidcore/src/bitstream/mbcoding.c	2002/07/28 13:06:46	347
@@ -413,18 +413,6 @@
 {
 
 	if (frame->coding_type == P_VOP) {
-		if (pMB->cbp == 0 && pMB->mode == MODE_INTER && pMB->mvs[0].x == 0 &&
-			pMB->mvs[0].y == 0) {
-
-#ifdef _DISABLE_SKIP
-/* disable SKIP when Bframes active until some workaround for the B-SKIP problem is found */
-			BitstreamPutBit(bs, 0);	// always coded!
-#else
-			BitstreamPutBit(bs, 1);	// not_coded
-
-			return;
-#endif
-		} else
 			BitstreamPutBit(bs, 0);	// coded
 	}
 
@@ -435,6 +423,15 @@
 
 }
 
+
+void
+MBSkip(Bitstream * bs)
+{
+	BitstreamPutBit(bs, 1);	// not coded
+	return;
+}
+
+
 /***************************************************************
  * bframe encoding start
  ***************************************************************/
@@ -561,8 +558,8 @@
 	}
 
 	if (mb->mode == MODE_DIRECT) {
-		CodeVector(bs, mb->mvs[0].x, 1, pStat);		/* fcode is always 1 for delta vector */
-		CodeVector(bs, mb->mvs[0].y, 1, pStat);		/* prediction is always (0,0) */
+		CodeVector(bs, mb->deltamv.x, 1, pStat);		/* fcode is always 1 for delta vector */
+		CodeVector(bs, mb->deltamv.y, 1, pStat);		/* prediction is always (0,0) */
 	}
 
 	for (i = 0; i < 6; i++) {