--- colorspace.h	2002/03/08 02:44:45	1.1
+++ colorspace.h	2002/06/12 20:38:40	1.3
@@ -2,7 +2,7 @@
 #define _COLORSPACE_H
 
 #include "../portab.h"
-
+#include "../divx4.h"
 
 /* initialize tables */
 
@@ -11,10 +11,15 @@
 
 /* input color conversion functions (encoder) */
 
-typedef void (color_inputFunc)(uint8_t *y_out, uint8_t *u_out, uint8_t *v_out,
-							uint8_t *src, int width, int height, int stride);
+typedef void (color_inputFunc) (uint8_t * y_out,
+								uint8_t * u_out,
+								uint8_t * v_out,
+								uint8_t * src,
+								int width,
+								int height,
+								int stride);
 
-typedef color_inputFunc *color_inputFuncPtr;	
+typedef color_inputFunc *color_inputFuncPtr;
 
 extern color_inputFuncPtr rgb555_to_yv12;
 extern color_inputFuncPtr rgb565_to_yv12;
@@ -45,13 +50,18 @@
 
 
 /* output color conversion functions (decoder) */
- 
-typedef void (color_outputFunc)(uint8_t *dst, int dst_stride,
-							 uint8_t *y_src, uint8_t *v_src,
-							 uint8_t * u_src, int y_stride,
-							 int uv_stride, int width, int height);
 
-typedef color_outputFunc* color_outputFuncPtr;	
+typedef void (color_outputFunc) (uint8_t * dst,
+								 int dst_stride,
+								 uint8_t * y_src,
+								 uint8_t * v_src,
+								 uint8_t * u_src,
+								 int y_stride,
+								 int uv_stride,
+								 int width,
+								 int height);
+
+typedef color_outputFunc *color_outputFuncPtr;
 
 extern color_outputFuncPtr yv12_to_rgb555;
 extern color_outputFuncPtr yv12_to_rgb565;
@@ -78,4 +88,13 @@
 color_outputFunc yv12_to_yuyv_mmx;
 color_outputFunc yv12_to_uyvy_mmx;
 
-#endif /* _COLORSPACE_H_ */
+
+void user_to_yuv_c(uint8_t * y_out,
+				   uint8_t * u_out,
+				   uint8_t * v_out,
+				   int stride,
+				   DEC_PICTURE * picture,
+				   int width,
+				   int height);
+
+#endif							/* _COLORSPACE_H_ */