[Mplayer-cvslog] CVS: main/postproc swscale_template.c,1.87,1.88

[Michael Niedermayer]

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

Modified Files:
	swscale_template.c 
Log Message:
fixing y422p output


Index: swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- swscale_template.c	9 Jul 2002 17:01:52 -0000	1.87
+++ swscale_template.c	9 Sep 2002 22:48:39 -0000	1.88
@@ -2503,7 +2503,8 @@
 	    {
 		if(isPlanarYUV(dstFormat) || isGray(dstFormat)) //YV12 like
 		{
-			if((dstY&1) || isGray(dstFormat)) uDest=vDest= NULL; //FIXME split functions in lumi / chromi
+			const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
+			if((dstY&chrSkipMask) || isGray(dstFormat)) uDest=vDest= NULL; //FIXME split functions in lumi / chromi
 			if(vLumFilterSize == 1 && vChrFilterSize == 1) // Unscaled YV12
 			{
 				int16_t *lumBuf = lumPixBuf[0];
@@ -2559,7 +2560,8 @@
 		int16_t **chrSrcPtr= chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
 		if(isPlanarYUV(dstFormat) || isGray(dstFormat)) //YV12
 		{
-			if((dstY&1) || isGray(dstFormat)) uDest=vDest= NULL;
+			const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
+			if((dstY&chrSkipMask) || isGray(dstFormat)) uDest=vDest= NULL; //FIXME split functions in lumi / chromi
 			yuv2yuvXinC(
 				vLumFilter+dstY*vLumFilterSize   , lumSrcPtr, vLumFilterSize,
 				vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,