[Mplayer-cvslog] CVS: main/postproc swscale.c,1.107,1.108

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/postproc
In directory mail:/var/tmp.root/cvs-serv28445

Modified Files:
	swscale.c 
Log Message:
fixing yuy2 upscaling (use -sws 0 for the faster but uglier variant)


Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- swscale.c	13 Oct 2002 17:23:02 -0000	1.107
+++ swscale.c	13 Oct 2002 19:46:51 -0000	1.108
@@ -2047,16 +2047,6 @@
 					vo_format_name(srcFormat), vo_format_name(dstFormat));
 			return c;
 		}
-		/* yv12_to_yuy2 */
-		if((srcFormat == IMGFMT_YV12||srcFormat==IMGFMT_I420)&&dstFormat == IMGFMT_YUY2)
-		{
-			c->swScale= PlanarToYuy2Wrapper;
-
-			if(flags&SWS_PRINT_INFO)
-				MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n", 
-					vo_format_name(srcFormat), vo_format_name(dstFormat));
-			return c;
-		}
 		/* yuv2bgr */
 		if((srcFormat==IMGFMT_YV12 || srcFormat==IMGFMT_I420) && isBGR(dstFormat))
 		{
@@ -2121,6 +2111,17 @@
 			  && (isBGR(dstFormat) || isRGB(dstFormat)) 
 			  && needsDither)
 				c->swScale= rgb2rgbWrapper;
+
+			/* yv12_to_yuy2 */
+			if((srcFormat == IMGFMT_YV12||srcFormat==IMGFMT_I420)&&dstFormat == IMGFMT_YUY2)
+			{
+				c->swScale= PlanarToYuy2Wrapper;
+
+				if(flags&SWS_PRINT_INFO)
+					MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n", 
+						vo_format_name(srcFormat), vo_format_name(dstFormat));
+				return c;
+			}
 		}
 
 		if(c->swScale){