[Mplayer-cvslog] CVS: main/postproc swscale.c,1.133,1.134

[Michael Niedermayer CVS]

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

Modified Files:
	swscale.c 
Log Message:
minimum slice size fix (fixes 422P 1 line per slice, used by huffyuv)


Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- swscale.c	15 Oct 2003 12:08:31 -0000	1.133
+++ swscale.c	22 Oct 2003 00:19:20 -0000	1.134
@@ -1963,10 +1963,9 @@
 		int chrI= i*c->chrDstH / dstH;
 		int nextSlice= MAX(c->vLumFilterPos[i   ] + c->vLumFilterSize - 1,
 				 ((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1)<<c->chrSrcVSubSample));
-		if(c->chrSrcVSubSample > 1) 
-		    nextSlice&= ~3; // Slices start at boundaries which are divisable through 4
-		else
-		    nextSlice&= ~1; // Slices start at boundaries which are divisable through 2
+
+		nextSlice>>= c->chrSrcVSubSample;
+		nextSlice<<= c->chrSrcVSubSample;
 		if(c->vLumFilterPos[i   ] + c->vLumBufSize < nextSlice)
 			c->vLumBufSize= nextSlice - c->vLumFilterPos[i   ];
 		if(c->vChrFilterPos[chrI] + c->vChrBufSize < (nextSlice>>c->chrSrcVSubSample))