--- trunk/xvidcore/src/image/image.c	2002/09/06 17:37:07	433
+++ trunk/xvidcore/src/image/image.c	2002/09/25 23:37:09	541
@@ -142,8 +142,7 @@
 			   uint32_t edged_width,
 			   uint32_t edged_height,
 			   uint32_t width,
-			   uint32_t height,
-			   uint32_t interlacing)
+			   uint32_t height)
 {
 	const uint32_t edged_width2 = edged_width / 2;
 	const uint32_t width2 = width / 2;
@@ -156,18 +155,10 @@
 	src = image->y;
 
 	for (i = 0; i < EDGE_SIZE; i++) {
-/*		// 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 {*/
 			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;
 	}
 
@@ -180,18 +171,10 @@
 
 	src -= edged_width;
 	for (i = 0; i < EDGE_SIZE; i++) {
-/*		// 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 {*/
 			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;
 	}
 
@@ -265,13 +248,6 @@
 	const uint32_t offset = EDGE_SIZE * (edged_width + 1);
 	const uint32_t stride_add = 7 * edged_width;
 
-#ifdef BFRAMES
-	const uint32_t edged_width2 = edged_width / 2;
-	const uint32_t edged_height2 = edged_height / 2;
-	const uint32_t offset2 = EDGE_SIZE2 * (edged_width2 + 1);
-	const uint32_t stride_add2 = 7 * edged_width2;
-#endif
-
 	uint8_t *n_ptr, *h_ptr, *v_ptr, *hv_ptr;
 	uint32_t x, y;
 
@@ -303,62 +279,6 @@
 		n_ptr += stride_add;
 	}
 
-#ifdef BFRAMES
-	n_ptr = refn->u;
-	h_ptr = refh->u;
-	v_ptr = refv->u;
-	hv_ptr = refhv->u;
-
-	n_ptr -= offset2;
-	h_ptr -= offset2;
-	v_ptr -= offset2;
-	hv_ptr -= offset2;
-
-	for (y = 0; y < edged_height2; y = y + 8) {
-		for (x = 0; x < edged_width2; x = 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);
-
-			n_ptr += 8;
-			h_ptr += 8;
-			v_ptr += 8;
-			hv_ptr += 8;
-		}
-		h_ptr += stride_add2;
-		v_ptr += stride_add2;
-		hv_ptr += stride_add2;
-		n_ptr += stride_add2;
-	}
-
-	n_ptr = refn->v;
-	h_ptr = refh->v;
-	v_ptr = refv->v;
-	hv_ptr = refhv->v;
-
-	n_ptr -= offset2;
-	h_ptr -= offset2;
-	v_ptr -= offset2;
-	hv_ptr -= offset2;
-
-	for (y = 0; y < edged_height2; y = y + 8) {
-		for (x = 0; x < edged_width2; x = 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);
-
-			n_ptr += 8;
-			h_ptr += 8;
-			v_ptr += 8;
-			hv_ptr += 8;
-		}
-		h_ptr += stride_add2;
-		v_ptr += stride_add2;
-		hv_ptr += stride_add2;
-		n_ptr += stride_add2;
-	}
-#endif
-
 	/*
 	   interpolate_halfpel_h(
 	   refh->y - offset,