[Mplayer-cvslog] CVS: main/postproc swscale.c,1.93,1.94 swscale_template.c,1.80,1.81

[Michael Niedermayer]

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

Modified Files:
	swscale.c swscale_template.c 
Log Message:

cleanup


Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- swscale.c	23 Jun 2002 10:36:18 -0000	1.93
+++ swscale.c	23 Jun 2002 11:01:25 -0000	1.94
@@ -102,8 +102,6 @@
 //FIXME replace this with something faster
 #define isPlanarYUV(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YVU9)
 #define isYUV(x)       ((x)==IMGFMT_YUY2 || isPlanarYUV(x))
-#define isHalfChrV(x)  ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420)
-#define isHalfChrH(x)  ((x)==IMGFMT_YUY2 || (x)==IMGFMT_YV12 || (x)==IMGFMT_I420)
 #define isGray(x)      ((x)==IMGFMT_Y800)
 #define isSupportedIn(x)  ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YUY2 \
 			|| (x)==IMGFMT_BGR32|| (x)==IMGFMT_BGR24|| (x)==IMGFMT_BGR16|| (x)==IMGFMT_BGR15\

Index: swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- swscale_template.c	23 Jun 2002 10:36:18 -0000	1.80
+++ swscale_template.c	23 Jun 2002 11:01:25 -0000	1.81
@@ -2709,9 +2709,9 @@
 
 	for(;dstY < dstH; dstY++){
 		unsigned char *dest =dst[0]+dstStride[0]*dstY;
-		unsigned char *uDest=dst[1]+dstStride[1]*(dstY>>1);
-		unsigned char *vDest=dst[2]+dstStride[2]*(dstY>>1);
-		const int chrDstY= isHalfChrV(dstFormat) ? (dstY>>1) : dstY;
+		const int chrDstY= dstY>>c->chrDstVSubSample;
+		unsigned char *uDest=dst[1]+dstStride[1]*chrDstY;
+		unsigned char *vDest=dst[2]+dstStride[2]*chrDstY;
 
 		const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input
 		const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input