summaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authorsdrik <sdrik@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-20 14:01:51 +0000
committersdrik <sdrik@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-20 14:01:51 +0000
commit218c79a44da2aa3bc275f7e716c930975f420d7a (patch)
tree8443fa6f719ec864d52372b305d10167c703f78b /libswscale/swscale.c
parente7c09a0f2bb77ccc781115e0a60bfe33821a5ac0 (diff)
downloadmpv-218c79a44da2aa3bc275f7e716c930975f420d7a.tar.bz2
mpv-218c79a44da2aa3bc275f7e716c930975f420d7a.tar.xz
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
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c5
1 files changed, 1 insertions, 4 deletions
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)