From 3f7bb50cdda2babf036d697887a710efe57d5250 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 23 Jun 2002 11:01:25 +0000 Subject: [PATCH] cleanup Originally committed as revision 6521 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc --- postproc/swscale.c | 2 -- postproc/swscale_template.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/postproc/swscale.c b/postproc/swscale.c index 5b4953c02..f21776182 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -102,8 +102,6 @@ untested special converters //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\ diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 5a8b25cd7..89ddb4b0e 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -2709,9 +2709,9 @@ i--; 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 -- 2.11.0