--- image.c	2003/12/12 08:19:13	1.26.2.12
+++ image.c	2004/02/07 10:01:27	1.26.2.16
@@ -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: image.c,v 1.26.2.12 2003/12/12 08:19:13 chl Exp $
+ * $Id: image.c,v 1.26.2.16 2004/02/07 10:01:27 chl Exp $
  *
  ****************************************************************************/
 
@@ -598,6 +598,14 @@
 			interlacing?rgbai_to_yv12  :rgba_to_yv12,
 			interlacing?rgbai_to_yv12_c:rgba_to_yv12_c, 4);
 		break;
+            
+	case XVID_CSP_ARGB:
+		safe_packed_conv(
+			src[0], src_stride[0], image->y, image->u, image->v,
+			edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),
+			interlacing?argbi_to_yv12  : argb_to_yv12,
+			interlacing?argbi_to_yv12_c: argb_to_yv12_c, 4);
+		break;
 
 	case XVID_CSP_YUY2:
 		safe_packed_conv(
@@ -609,7 +617,7 @@
 
 	case XVID_CSP_YVYU:		/* u/v swapped */
 		safe_packed_conv(
-			src[0], src_stride[0], image->y, image->v, image->y,
+			src[0], src_stride[0], image->y, image->v, image->u,
 			edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),
 			interlacing?yuyvi_to_yv12  :yuyv_to_yv12,
 			interlacing?yuyvi_to_yv12_c:yuyv_to_yv12_c, 2);
@@ -623,19 +631,19 @@
 			interlacing?uyvyi_to_yv12_c:uyvy_to_yv12_c, 2);
 		break;
 
-	case XVID_CSP_I420: /* YCrCb == internal colorspace for MPEG */
+	case XVID_CSP_I420:	/* YCbCr == YUV == internal colorspace for MPEG */
 		yv12_to_yv12(image->y, image->u, image->v, edged_width, edged_width2,
 			src[0], src[0] + src_stride[0]*height, src[0] + src_stride[0]*height + (src_stride[0]/2)*height2,
 			src_stride[0], src_stride[0]/2, width, height, (csp & XVID_CSP_VFLIP));
 		break;
-    
-	case XVID_CSP_YV12:	/* YCbCr == U and V plane swapped */
+
+	case XVID_CSP_YV12: /* YCrCb == YVA == U and V plane swapped */
 		yv12_to_yv12(image->y, image->v, image->u, edged_width, edged_width2,
 			src[0], src[0] + src_stride[0]*height, src[0] + src_stride[0]*height + (src_stride[0]/2)*height2,
 			src_stride[0], src_stride[0]/2, width, height, (csp & XVID_CSP_VFLIP));
 		break;
 
-	case XVID_CSP_USER :  /* YCrCb with arbitrary pointers and different strides for Y and UV */
+	case XVID_CSP_PLANAR:  /* YCbCr with arbitrary pointers and different strides for Y and UV */
 		yv12_to_yv12(image->y, image->u, image->v, edged_width, edged_width2,
 			src[0], src[1], src[2], src_stride[0], src_stride[1],  /* v: dst_stride[2] not yet supported */
 			width, height, (csp & XVID_CSP_VFLIP));
@@ -767,6 +775,14 @@
 			interlacing?yv12_to_rgbai_c:yv12_to_rgba_c, 4);
 		return 0;
 
+	case XVID_CSP_ARGB:
+		safe_packed_conv(
+			dst[0], dst_stride[0], image->y, image->u, image->v,
+			edged_width, edged_width2, width, height, (csp & XVID_CSP_VFLIP),
+			interlacing?yv12_to_argbi  :yv12_to_argb,
+			interlacing?yv12_to_argbi_c:yv12_to_argb_c, 4);
+		return 0;
+
 	case XVID_CSP_YUY2:
 		safe_packed_conv(
 			dst[0], dst_stride[0], image->y, image->u, image->v,
@@ -791,21 +807,21 @@
 			interlacing?yv12_to_uyvyi_c:yv12_to_uyvy_c, 2);
 		return 0;
 
-	case XVID_CSP_I420: /* YCrCb == internal colorspace for MPEG */
+	case XVID_CSP_I420: /* YCbCr == YUV == internal colorspace for MPEG */
 		yv12_to_yv12(dst[0], dst[0] + dst_stride[0]*height, dst[0] + dst_stride[0]*height + (dst_stride[0]/2)*height2,
 			dst_stride[0], dst_stride[0]/2,
 			image->y, image->u, image->v, edged_width, edged_width2,
 			width, height, (csp & XVID_CSP_VFLIP));
 		return 0;
 
-	case XVID_CSP_YV12:	/* YCbCr == U and V plane swapped */
+	case XVID_CSP_YV12:	/* YCrCb == YVU == U and V plane swapped */
 		yv12_to_yv12(dst[0], dst[0] + dst_stride[0]*height, dst[0] + dst_stride[0]*height + (dst_stride[0]/2)*height2,
 			dst_stride[0], dst_stride[0]/2,
 			image->y, image->v, image->u, edged_width, edged_width2,
 			width, height, (csp & XVID_CSP_VFLIP));
 		return 0;
 
-	case XVID_CSP_USER :  /* YCrCb with arbitrary pointers and different strides for Y and UV */
+	case XVID_CSP_PLANAR:  /* YCbCr with arbitrary pointers and different strides for Y and UV */
 		yv12_to_yv12(dst[0], dst[1], dst[2],
 			dst_stride[0], dst_stride[1],	/* v: dst_stride[2] not yet supported */
 			image->y, image->u, image->v, edged_width, edged_width2,