summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsdrik <sdrik@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-17 19:51:52 +0000
committersdrik <sdrik@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-17 19:51:52 +0000
commitbaf5ee6d67308aea8b45db1b2ea6ff0fa5d9a4fc (patch)
treee86e171a499110d5663e06feecdbf90827c2abb9
parent0c0d1415646ea193ec1f8e77bb61ec99de08ff67 (diff)
downloadmpv-baf5ee6d67308aea8b45db1b2ea6ff0fa5d9a4fc.tar.bz2
mpv-baf5ee6d67308aea8b45db1b2ea6ff0fa5d9a4fc.tar.xz
Don't write outside of the picture buffer in planarCopy in the gray case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28985 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index c6012c15b7..8728e2bb6c 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1934,8 +1934,14 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0)
{
- if (!isGray(c->dstFormat))
- memset(dst[plane], 128, dstStride[plane]*height);
+ if (!isGray(c->dstFormat)){
+ int i;
+ uint8_t *ptr = dst[plane] + dstStride[plane]*y;
+ for (i=0; i<height; i++){
+ memset(ptr, 128, length);
+ ptr += dstStride[plane];
+ }
+ }
}
else
{