[SCM] libav/experimental: minimum slice size fix (fixes 422P 1 line per slice, used by huffyuv)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c4f1e443e7865e051b886bbf7b7d4631b4c87561
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Oct 22 00:19:20 2003 +0000

    minimum slice size fix (fixes 422P 1 line per slice, used by huffyuv)
    
    Originally committed as revision 11214 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

diff --git a/postproc/swscale.c b/postproc/swscale.c
index d46e616..508bf01 100644
--- a/postproc/swscale.c
+++ b/postproc/swscale.c
@@ -1963,10 +1963,9 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
 		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))

-- 
Libav/FFmpeg packaging