--- trunk/xvidcore/src/bitstream/mbcoding.c	2007/06/27 14:38:05	1775
+++ trunk/xvidcore/src/bitstream/mbcoding.c	2007/06/28 14:55:11	1777
@@ -19,7 +19,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: mbcoding.c,v 1.55 2007-06-27 14:38:05 Isibaar Exp $
+ * $Id: mbcoding.c,v 1.56 2007-06-28 14:55:11 Skal Exp $
  *
  ****************************************************************************/
 
@@ -1075,7 +1075,7 @@
 	return (level << 20) >> 20;
 
   error:
-	*run = VLC_ERROR;
+	*run = 64;
 	return 0;
 }
 
@@ -1092,7 +1092,7 @@
 	do {
 		level = get_coeff(bs, &run, &last, 1, 0);
 		coeff += run;
-		if ((run|coeff)&~63) {
+		if (coeff & ~63) {
 			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index");
 			break;
 		}
@@ -1133,7 +1133,7 @@
 	do {
 		level = get_coeff(bs, &run, &last, 0, 0);
 		p += run;
-		if ((p|run)&~63) {
+		if (p & ~63) {
 			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index");
 			break;
 		}
@@ -1168,7 +1168,7 @@
 	do {
 		level = get_coeff(bs, &run, &last, 0, 0);
 		p += run;
-		if ((p|run)&~63) {
+		if (p & ~63) {
 			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index");
 			break;
 		}