--- trunk/xvidcore/src/image/image.c	2002/07/19 11:15:21	315
+++ branches/dev-api-3/xvidcore/src/image/image.c	2002/09/23 20:36:02	530
@@ -3,6 +3,15 @@
  *	XVID MPEG-4 VIDEO CODEC
  *	image stuff
  *
+ *	This program is an implementation of a part of one or more MPEG-4
+ *	Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
+ *	to use this software module in hardware or software products are
+ *	advised that its use may infringe existing patents or copyrights, and
+ *	any such use would be at such party's own risk.  The original
+ *	developer of this software module and his/her company, and subsequent
+ *	editors and their companies, will have no liability for use of this
+ *	software or modifications or derivatives thereof.
+ *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
  *	the Free Software Foundation; either version 2 of the License, or
@@ -295,8 +304,8 @@
 	v_ptr -= offset;
 	hv_ptr -= offset;
 
-	for (y = 0; y < edged_height; y = y + 8) {
-		for (x = 0; x < edged_width; x = x + 8) {
+	for (y = 0; y < edged_height; y += 8) {
+		for (x = 0; x < edged_width; x += 8) {
 			interpolate8x8_halfpel_h(h_ptr, n_ptr, edged_width, rounding);
 			interpolate8x8_halfpel_v(v_ptr, n_ptr, edged_width, rounding);
 			interpolate8x8_halfpel_hv(hv_ptr, n_ptr, edged_width, rounding);
@@ -311,7 +320,7 @@
 		hv_ptr += stride_add;
 		n_ptr += stride_add;
 	}
-
+/*
 #ifdef BFRAMES
 	n_ptr = refn->u;
 	h_ptr = refh->u;
@@ -323,8 +332,8 @@
 	v_ptr -= offset2;
 	hv_ptr -= offset2;
 
-	for (y = 0; y < edged_height2; y = y + 8) {
-		for (x = 0; x < edged_width2; x = x + 8) {
+	for (y = 0; y < edged_height2; y += 8) {
+		for (x = 0; x < edged_width2; x += 8) {
 			interpolate8x8_halfpel_h(h_ptr, n_ptr, edged_width2, rounding);
 			interpolate8x8_halfpel_v(v_ptr, n_ptr, edged_width2, rounding);
 			interpolate8x8_halfpel_hv(hv_ptr, n_ptr, edged_width2, rounding);
@@ -367,7 +376,7 @@
 		n_ptr += stride_add2;
 	}
 #endif
-
+*/
 	/*
 	   interpolate_halfpel_h(
 	   refh->y - offset,
@@ -751,7 +760,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 +770,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;