--- ../JM102/ldecod/src/mb_access.c	2006-03-29 21:47:41.000000000 -0800
+++ ldecod/src/mb_access.c	2006-04-30 17:21:14.664037104 -0700
@@ -185,8 +185,8 @@
 
   if (pix->available || img->DeblockCall)
   {
-    pix->x = (xN + maxW) % maxW;
-    pix->y = (yN + maxH) % maxH;
+    pix->x = xN & (maxW-1);
+    pix->y = yN & (maxH-1);
     get_mb_pos(pix->mb_addr, &(pix->pos_x), &(pix->pos_y));
     if (luma)
     {
@@ -195,8 +195,8 @@
     }
     else
     {
-      pix->pos_x = pix->pos_x/(16/img->mb_cr_size_x) + pix->x;
-      pix->pos_y = pix->pos_y/(16/img->mb_cr_size_y) + pix->y;
+      pix->pos_x = (pix->pos_x * img->mb_cr_size_x >> 4) + pix->x;
+      pix->pos_y = (pix->pos_y * img->mb_cr_size_y >> 4) + pix->y;
     }
   }
 }