--- branches/dev-api-4/xvidcore/src/image/colorspace.c	2003/12/20 19:13:24	1289
+++ branches/dev-api-4/xvidcore/src/image/colorspace.c	2003/12/20 22:20:54	1290
@@ -19,7 +19,7 @@
  *  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.c,v 1.8.2.4 2003-10-01 23:23:01 edgomez Exp $
+ * $Id: colorspace.c,v 1.8.2.5 2003-12-20 22:20:54 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -37,6 +37,7 @@
 packedFuncPtr bgra_to_yv12;
 packedFuncPtr abgr_to_yv12;
 packedFuncPtr rgba_to_yv12;
+packedFuncPtr argb_to_yv12;
 packedFuncPtr yuv_to_yv12;
 packedFuncPtr yuyv_to_yv12;
 packedFuncPtr uyvy_to_yv12;
@@ -47,6 +48,7 @@
 packedFuncPtr bgrai_to_yv12;
 packedFuncPtr abgri_to_yv12;
 packedFuncPtr rgbai_to_yv12;
+packedFuncPtr argbi_to_yv12;
 packedFuncPtr yuyvi_to_yv12;
 packedFuncPtr uyvyi_to_yv12;
 
@@ -57,6 +59,7 @@
 packedFuncPtr yv12_to_bgra;
 packedFuncPtr yv12_to_abgr;
 packedFuncPtr yv12_to_rgba;
+packedFuncPtr yv12_to_argb;
 packedFuncPtr yv12_to_yuv;
 packedFuncPtr yv12_to_yuyv;
 packedFuncPtr yv12_to_uyvy;
@@ -67,6 +70,7 @@
 packedFuncPtr yv12_to_bgrai;
 packedFuncPtr yv12_to_abgri;
 packedFuncPtr yv12_to_rgbai;
+packedFuncPtr yv12_to_argbi;
 packedFuncPtr yv12_to_yuyvi;
 packedFuncPtr yv12_to_uyvyi;
 
@@ -288,6 +292,7 @@
 MAKE_COLORSPACE(bgra_to_yv12_c,    4,2,2, RGB_TO_YV12,    2,1,0, 0)
 MAKE_COLORSPACE(abgr_to_yv12_c,    4,2,2, RGB_TO_YV12,    3,2,1, 0)
 MAKE_COLORSPACE(rgba_to_yv12_c,    4,2,2, RGB_TO_YV12,    0,1,2, 0)
+MAKE_COLORSPACE(argb_to_yv12_c,    4,2,2, RGB_TO_YV12,    1,2,3, 0)
 MAKE_COLORSPACE(yuyv_to_yv12_c,    2,2,2, YUYV_TO_YV12,   0,1,2,3)
 MAKE_COLORSPACE(uyvy_to_yv12_c,    2,2,2, YUYV_TO_YV12,   1,0,3,2)
 
@@ -297,6 +302,7 @@
 MAKE_COLORSPACE(bgrai_to_yv12_c,   4,2,4, RGBI_TO_YV12,   2,1,0, 0)
 MAKE_COLORSPACE(abgri_to_yv12_c,   4,2,4, RGBI_TO_YV12,   3,2,1, 0)
 MAKE_COLORSPACE(rgbai_to_yv12_c,   4,2,4, RGBI_TO_YV12,   0,1,2, 0)
+MAKE_COLORSPACE(argbi_to_yv12_c,   4,2,4, RGBI_TO_YV12,   1,2,3, 0)
 MAKE_COLORSPACE(yuyvi_to_yv12_c,   2,2,4, YUYVI_TO_YV12,  0,1,2,3)
 MAKE_COLORSPACE(uyvyi_to_yv12_c,   2,2,4, YUYVI_TO_YV12,  1,0,3,2)
 
@@ -440,6 +446,7 @@
 MAKE_COLORSPACE(yv12_to_bgra_c,    4,2,2, YV12_TO_RGB,	  2,1,0,3)
 MAKE_COLORSPACE(yv12_to_abgr_c,    4,2,2, YV12_TO_RGB,    3,2,1,0)
 MAKE_COLORSPACE(yv12_to_rgba_c,    4,2,2, YV12_TO_RGB,    0,1,2,3)
+MAKE_COLORSPACE(yv12_to_argb_c,    4,2,2, YV12_TO_RGB,    1,2,3,0)
 MAKE_COLORSPACE(yv12_to_yuyv_c,    2,2,2, YV12_TO_YUYV,   0,1,2,3)
 MAKE_COLORSPACE(yv12_to_uyvy_c,    2,2,2, YV12_TO_YUYV,   1,0,3,2)
 
@@ -449,6 +456,7 @@
 MAKE_COLORSPACE(yv12_to_bgrai_c,   4,2,4, YV12_TO_RGBI,	  2,1,0,3)
 MAKE_COLORSPACE(yv12_to_abgri_c,   4,2,4, YV12_TO_RGBI,   3,2,1,0)
 MAKE_COLORSPACE(yv12_to_rgbai_c,   4,2,4, YV12_TO_RGBI,   0,1,2,3)
+MAKE_COLORSPACE(yv12_to_argbi_c,   4,2,4, YV12_TO_RGBI,   1,2,3,0)
 MAKE_COLORSPACE(yv12_to_yuyvi_c,   2,2,4, YV12_TO_YUYVI,  0,1,2,3)
 MAKE_COLORSPACE(yv12_to_uyvyi_c,   2,2,4, YV12_TO_YUYVI,  1,0,3,2)