--- image.h	2002/12/14 06:07:03	1.8.2.7
+++ image.h	2002/09/25 23:37:09	1.9
@@ -2,20 +2,21 @@
 #define _IMAGE_H_
 
 #include "../portab.h"
-#include "../global.h"
 #include "colorspace.h"
 #include "../xvid.h"
 
-#define EDGE_SIZE  64
-
-void init_image(uint32_t cpu_flags);
+#define EDGE_SIZE  32
 
 
-static void __inline
-image_null(IMAGE * image)
+typedef struct
 {
-	image->y = image->u = image->v = NULL;
+	uint8_t *y;
+	uint8_t *u;
+	uint8_t *v;
 }
+IMAGE;
+
+void init_image(uint32_t cpu_flags);
 
 int32_t image_create(IMAGE * image,
 					 uint32_t edged_width,
@@ -41,7 +42,6 @@
 					   IMAGE * refhv,
 					   uint32_t edged_width,
 					   uint32_t edged_height,
-					   uint32_t quarterpel,
 					   uint32_t rounding);
 
 float image_psnr(IMAGE * orig_image,
@@ -51,18 +51,12 @@
 				 uint16_t height);
 
 
-void
-image_chroma_optimize(IMAGE * img, int width, int height, int edged_width);
-
-
 int image_input(IMAGE * image,
 				uint32_t width,
 				int height,
 				uint32_t edged_width,
 				uint8_t * src,
-				int src_stride,
-				int csp,
-				int interlaced);
+				int csp);
 
 int image_output(IMAGE * image,
 				 uint32_t width,
@@ -70,8 +64,7 @@
 				 uint32_t edged_width,
 				 uint8_t * dst,
 				 uint32_t dst_stride,
-				 int csp,
-				 int interlaced);
+				 int csp);
 
 
 
@@ -90,16 +83,4 @@
 void
 output_slice(IMAGE * cur, int edged_width, int width, XVID_DEC_PICTURE* out_frm, int mbx, int mby,int mbl);
 
-
-void
-image_clear(IMAGE * img, int width, int height, int edged_width,
-					int y, int u, int v);
-
-
-void
-image_deblock_rrv(IMAGE * img, int edgeg_width,
-				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
-				int block, int flags);
-
-
 #endif							/* _IMAGE_H_ */