--- branches/dev-api-4/xvidcore/src/image/image.c	2004/01/31 14:51:56	1347
+++ branches/dev-api-4/xvidcore/src/image/image.c	2004/02/01 11:32:33	1348
@@ -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.14 2004-01-30 18:53:50 chl Exp $
+ * $Id: image.c,v 1.26.2.15 2004-02-01 11:32:33 chl Exp $
  *
  ****************************************************************************/
 
@@ -631,13 +631,13 @@
 			interlacing?uyvyi_to_yv12_c:uyvy_to_yv12_c, 2);
 		break;
 
-	case XVID_CSP_YV12:	/* 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_I420: /* 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));
@@ -807,14 +807,14 @@
 			interlacing?yv12_to_uyvyi_c:yv12_to_uyvy_c, 2);
 		return 0;
 
-	case XVID_CSP_YV12: /* YCbCr == 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_I420:	/* YCrCb == 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,