--- colorspace.h	2003/02/15 15:22:18	1.5
+++ colorspace.h	2004/03/22 22:36:23	1.6
@@ -1,8 +1,32 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Colorspace related header  -
+ *
+ *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
+ *
+ *  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
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * $Id: colorspace.h,v 1.6 2004/03/22 22:36:23 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _COLORSPACE_H
 #define _COLORSPACE_H
 
 #include "../portab.h"
-#include "../divx4.h"
 
 /* initialize tables */
 
@@ -34,6 +58,7 @@
 extern packedFuncPtr bgra_to_yv12;
 extern packedFuncPtr abgr_to_yv12;
 extern packedFuncPtr rgba_to_yv12;
+extern packedFuncPtr argb_to_yv12;
 extern packedFuncPtr yuyv_to_yv12;
 extern packedFuncPtr uyvy_to_yv12;
 
@@ -43,10 +68,10 @@
 extern packedFuncPtr bgrai_to_yv12;
 extern packedFuncPtr abgri_to_yv12;
 extern packedFuncPtr rgbai_to_yv12;
+extern packedFuncPtr argbi_to_yv12;
 extern packedFuncPtr yuyvi_to_yv12;
 extern packedFuncPtr uyvyi_to_yv12;
 
-
 /* plain c */
 packedFunc rgb555_to_yv12_c;
 packedFunc rgb565_to_yv12_c;
@@ -54,6 +79,7 @@
 packedFunc bgra_to_yv12_c;
 packedFunc abgr_to_yv12_c;
 packedFunc rgba_to_yv12_c;
+packedFunc argb_to_yv12_c;
 packedFunc yuyv_to_yv12_c;
 packedFunc uyvy_to_yv12_c;
 
@@ -63,10 +89,11 @@
 packedFunc bgrai_to_yv12_c;
 packedFunc abgri_to_yv12_c;
 packedFunc rgbai_to_yv12_c;
+packedFunc argbi_to_yv12_c;
 packedFunc yuyvi_to_yv12_c;
 packedFunc uyvyi_to_yv12_c;
 
-
+#ifdef ARCH_IS_IA32
 /* mmx */
 packedFunc bgr_to_yv12_mmx;
 packedFunc bgra_to_yv12_mmx;
@@ -80,6 +107,7 @@
 /* xmm */
 packedFunc yuyv_to_yv12_xmm;
 packedFunc uyvy_to_yv12_xmm;
+#endif
 
 
 /* yv12_to_xxx colorspace conversion functions (decoder) */
@@ -90,6 +118,7 @@
 extern packedFuncPtr yv12_to_bgra;
 extern packedFuncPtr yv12_to_abgr;
 extern packedFuncPtr yv12_to_rgba;
+extern packedFuncPtr yv12_to_argb;
 extern packedFuncPtr yv12_to_yuyv;
 extern packedFuncPtr yv12_to_uyvy;
 
@@ -99,6 +128,7 @@
 extern packedFuncPtr yv12_to_bgrai;
 extern packedFuncPtr yv12_to_abgri;
 extern packedFuncPtr yv12_to_rgbai;
+extern packedFuncPtr yv12_to_argbi;
 extern packedFuncPtr yv12_to_yuyvi;
 extern packedFuncPtr yv12_to_uyvyi;
 
@@ -109,6 +139,7 @@
 packedFunc yv12_to_bgra_c;
 packedFunc yv12_to_abgr_c;
 packedFunc yv12_to_rgba_c;
+packedFunc yv12_to_argb_c;
 packedFunc yv12_to_yuyv_c;
 packedFunc yv12_to_uyvy_c;
 
@@ -118,9 +149,11 @@
 packedFunc yv12_to_bgrai_c;
 packedFunc yv12_to_abgri_c;
 packedFunc yv12_to_rgbai_c;
+packedFunc yv12_to_argbi_c;
 packedFunc yv12_to_yuyvi_c;
 packedFunc yv12_to_uyvyi_c;
 
+#ifdef ARCH_IS_IA32
 /* mmx */
 packedFunc yv12_to_bgr_mmx;
 packedFunc yv12_to_bgra_mmx;
@@ -129,12 +162,13 @@
 
 packedFunc yv12_to_yuyvi_mmx;
 packedFunc yv12_to_uyvyi_mmx;
+#endif
 
 
 typedef void (planarFunc) (
-				uint8_t * y_dst, uint8_t * u_dst, uint8_t * v_dst, 
+				uint8_t * y_dst, uint8_t * u_dst, uint8_t * v_dst,
 				int y_dst_stride, int uv_dst_stride,
-				uint8_t * y_src, uint8_t * u_src, uint8_t * v_src, 
+				uint8_t * y_src, uint8_t * u_src, uint8_t * v_src,
 				int y_src_stride, int uv_src_stride,
 				int width, int height, int vflip);
 typedef planarFunc *planarFuncPtr;
@@ -142,8 +176,11 @@
 extern planarFuncPtr yv12_to_yv12;
 
 planarFunc yv12_to_yv12_c;
+
+#ifdef ARCH_IS_IA32
 planarFunc yv12_to_yv12_mmx;
 planarFunc yv12_to_yv12_xmm;
+#endif
 
 
 #endif							/* _COLORSPACE_H_ */