Index: postproc/rgb2rgb_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb_template.c,v
retrieving revision 1.69
diff -u -r1.69 rgb2rgb_template.c
--- postproc/rgb2rgb_template.c	2 May 2004 14:26:28 -0000	1.69
+++ postproc/rgb2rgb_template.c	10 Aug 2004 13:46:52 -0000
@@ -2066,8 +2066,10 @@
 {
 	unsigned y;
 	const unsigned chromWidth= width>>1;
+	width &= ~1;
+	height &= ~1;
 #ifdef HAVE_MMX
-	for(y=0; y<height-2; y+=2)
+	for(y=0; y<height; y+=2)
 	{
 		unsigned i;
 		for(i=0; i<2; i++)
@@ -2291,7 +2293,7 @@
 			"movd %%mm0, (%3, %%eax)	\n\t"
 			"addl $4, %%eax			\n\t"
 			" js 1b				\n\t"
-			: : "r" (src+width*6), "r" (src+srcStride+width*6), "r" (udst+width), "r" (vdst+width), "g" (-width)
+			: : "r" (src+chromWidth*6), "r" (src+srcStride+chromWidth*6), "r" (udst+chromWidth), "r" (vdst+chromWidth), "g" (-chromWidth)
 			: "%eax", "%ebx"
 		);
 
@@ -2305,7 +2307,6 @@
 			:::"memory");
 #else
 	y=0;
-#endif
 	for(; y<height; y+=2)
 	{
 		unsigned i;
@@ -2355,6 +2356,7 @@
 		ydst += lumStride;
 		src  += srcStride;
 	}
+#endif
 }
 
 void RENAME(interleaveBytes)(uint8_t *src1, uint8_t *src2, uint8_t *dest,