--- estimation_pvop.c	2004/12/08 12:43:48	1.10
+++ estimation_pvop.c	2005/03/03 01:27:07	1.14
@@ -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: estimation_pvop.c,v 1.10 2004/12/08 12:43:48 syskin Exp $
+ * $Id: estimation_pvop.c,v 1.14 2005/03/03 01:27:07 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -771,16 +771,14 @@
 			*mvSum += mv[i].y * mv[i].y;
 		}
 	case MODE_INTER:
-		(*mvCount)++;	/* add mcsel==1 vector to statistics too, or else we ignore useful motion range info */
+		(*mvCount)++;
 		*mvSum += mv[0].x * mv[0].x;
 		*mvSum += mv[0].y * mv[0].y;
-		if (pMB->mcsel == 0) {
-			if (mv[0].x > max) max = mv[0].x;
-			else if (-mv[0].x - 1 > max) max = -mv[0].x - 1;
-			if (mv[0].y > max) max = mv[0].y;
-			else if (-mv[0].y - 1 > max) max = -mv[0].y - 1;
-			*MVmax = max;
-		}
+		if (mv[0].x > max) max = mv[0].x;
+		else if (-mv[0].x - 1 > max) max = -mv[0].x - 1;
+		if (mv[0].y > max) max = mv[0].y;
+		else if (-mv[0].y - 1 > max) max = -mv[0].y - 1;
+		*MVmax = max;
 	default:
 		break;
 	}
@@ -882,6 +880,7 @@
 			if ((current->vop_flags & XVID_VOP_CARTOON) &&
 				((sad00 < pMB->quant * 4 * skip_thresh) || (sad00 < stat_thresh))) {
 				ZeroMacroblockP(pMB, sad00);
+				pMB->cbp = 0x3f;
 				continue;
 			}
 
@@ -913,4 +912,4 @@
 	current->sStat.iMvCount = mvCount;
 
 	return 0;
-}
\ No newline at end of file
+}