[FFmpeg-cvslog] r29018 - trunk/libswscale/swscale.c

reimar subversion
Fri Mar 20 18:22:03 CET 2009


Author: reimar
Date: Fri Mar 20 18:22:03 2009
New Revision: 29018

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

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Fri Mar 20 17:29:47 2009	(r29017)
+++ trunk/libswscale/swscale.c	Fri Mar 20 18:22:03 2009	(r29018)
@@ -2117,7 +2117,8 @@ static int planarCopy(SwsContext *c, uin
         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
         {




More information about the ffmpeg-cvslog mailing list