From 218c79a44da2aa3bc275f7e716c930975f420d7a Mon Sep 17 00:00:00 2001 From: sdrik Date: Fri, 20 Mar 2009 14:01:51 +0000 Subject: Use a simpler and more general check for the gray case in the planarCopy function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29009 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libswscale/swscale.c') diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 9a74f95f86..17fe3c6fa7 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1989,11 +1989,8 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli int y= plane==0 ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample); int height= plane==0 ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample); - if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0) - { - if (!isGray(c->dstFormat)) + if (dst[plane] && !src[plane]) fillPlane(dst[plane], dstStride[plane], length, height, y, 128); - } else { if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0) -- cgit v1.2.3