[SCM] libav/experimental: Fix planarCopy to ignore the GRAY8 "pseudo"-palette, fixes libavtest regression test.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:42:06 UTC 2013


The following commit has been merged in the experimental branch:
commit 6f348086914992ca739eb57d2233593ef766218d
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sat Mar 21 10:20:16 2009 +0000

    Fix planarCopy to ignore the GRAY8 "pseudo"-palette, fixes libavtest regression test.
    
    Originally committed as revision 29021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index e9b65c4..bc35ad5 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2118,7 +2118,9 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
         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
         {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list