Mercurial > mplayer.hg

changeset 6520:f9a1870bc4a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
author michael
date Sun, 23 Jun 2002 11:01:25 +0000
parents 697e506b8dee
children adc50c83986d
files postproc/swscale.c postproc/swscale_template.c
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/postproc/swscale.c	Sun Jun 23 11:01:00 2002 +0000
+++ b/postproc/swscale.c	Sun Jun 23 11:01:25 2002 +0000
@@ -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\
--- a/postproc/swscale_template.c	Sun Jun 23 11:01:00 2002 +0000
+++ b/postproc/swscale_template.c	Sun Jun 23 11:01:25 2002 +0000
@@ -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