--- trunk/xvidcore/src/image/image.c	2002/07/19 11:15:21	315
+++ trunk/xvidcore/src/image/image.c	2002/09/04 03:45:45	389
@@ -165,18 +165,18 @@
 	src = image->y;
 
 	for (i = 0; i < EDGE_SIZE; i++) {
-		// if interlacing, edges contain top-most data from each field
+/*		// if interlacing, edges contain top-most data from each field
 		if (interlacing && (i & 1)) {
 			memset(dst, *(src + edged_width), EDGE_SIZE);
 			memcpy(dst + EDGE_SIZE, src + edged_width, width);
 			memset(dst + edged_width - EDGE_SIZE,
 				   *(src + edged_width + width - 1), EDGE_SIZE);
-		} else {
+		} else {*/
 			memset(dst, *src, EDGE_SIZE);
 			memcpy(dst + EDGE_SIZE, src, width);
 			memset(dst + edged_width - EDGE_SIZE, *(src + width - 1),
 				   EDGE_SIZE);
-		}
+		/*}*/
 		dst += edged_width;
 	}
 
@@ -189,18 +189,18 @@
 
 	src -= edged_width;
 	for (i = 0; i < EDGE_SIZE; i++) {
-		// if interlacing, edges contain bottom-most data from each field
+/*		// if interlacing, edges contain bottom-most data from each field
 		if (interlacing && !(i & 1)) {
 			memset(dst, *(src - edged_width), EDGE_SIZE);
 			memcpy(dst + EDGE_SIZE, src - edged_width, width);
 			memset(dst + edged_width - EDGE_SIZE,
 				   *(src - edged_width + width - 1), EDGE_SIZE);
-		} else {
+		} else {*/
 			memset(dst, *src, EDGE_SIZE);
 			memcpy(dst + EDGE_SIZE, src, width);
 			memset(dst + edged_width - EDGE_SIZE, *(src + width - 1),
 				   EDGE_SIZE);
-		}
+		/*}*/
 		dst += edged_width;
 	}
 
@@ -751,7 +751,7 @@
   if(w > width)
     w = width;
   w2 = w >> 1;
-void __inline
+
   dY = (uint8_t*)out_frm->y + (mby << 4) * out_frm->stride_y + (mbx << 4);
   dU = (uint8_t*)out_frm->u + (mby << 3) * out_frm->stride_u + (mbx << 3);
   dV = (uint8_t*)out_frm->v + (mby << 3) * out_frm->stride_v + (mbx << 3);
@@ -761,9 +761,9 @@
 
   for(i = 0 ; i < 16 ; i++) {
     memcpy(dY,sY,w);
-  dY = out_frm->y + (mby << 4) * out_frm->stride_y + (mbx << 4);
-  dU = out_frm->u + (mby << 3) * out_frm->stride_u + (mbx << 3);
-  dV = out_frm->v + (mby << 3) * out_frm->stride_v + (mbx << 3);
+    dY += out_frm->stride_y;
+    sY += std;
+  }
   for(i = 0 ; i < 8 ; i++) {
     memcpy(dU,sU,w2);
     dU += out_frm->stride_u;