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

reimar subversion
Sat Mar 21 11:20:17 CET 2009


Author: reimar
Date: Sat Mar 21 11:20:16 2009
New Revision: 29021

Log:
Fix planarCopy to ignore the GRAY8 "pseudo"-palette, fixes libavtest regression test.

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Mar 21 10:31:57 2009	(r29020)
+++ trunk/libswscale/swscale.c	Sat Mar 21 11:20:16 2009	(r29021)
@@ -2118,7 +2118,9 @@ static int planarCopy(SwsContext *c, uin
         int height= (plane==0 || plane==3) ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample);
 
         if (!dst[plane]) continue;
-        if (!src[plane])
+        // ignore palette for GRAY8
+        if (plane == 1 && !dst[2]) continue;
+        if (!src[plane] || (plane == 1 && !src[2]))
             fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
         else
         {




More information about the ffmpeg-cvslog mailing list