From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Fri, 20 Mar 2009 17:22:03 +0000 (+0000)
Subject: Avoid crash on planarCopy to a destination without alpha.
X-Git-Tag: android-x86-4.4-r1~27257
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=20ddf5a8e4cb6ce8c9a6dcfbabf6d0cef2a712df;p=android-x86%2Fexternal-ffmpeg.git

Avoid crash on planarCopy to a destination without alpha.
Makes regression tests run again, though the results are still wrong.

Originally committed as revision 29018 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
---

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 3b0cd975fa..e9b65c452d 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2117,7 +2117,8 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
         int y=      (plane==0 || plane==3) ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample);
         int height= (plane==0 || plane==3) ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample);
 
-        if (dst[plane] && !src[plane])
+        if (!dst[plane]) continue;
+        if (!src[plane])
             fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
         else
         {