[SCM] libav/experimental: Fill the r, g, b values used for computing the c->pal_yuv table in the case where the source format is PIX_FMT_GRAY8.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:02:48 UTC 2013


The following commit has been merged in the experimental branch:
commit 23bf3b2c97909329e5265d459d56bc22f391d1fe
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu Mar 4 00:31:13 2010 +0000

    Fill the r, g, b values used for computing the c->pal_yuv table in the
    case where the source format is PIX_FMT_GRAY8.
    
    This is required as PIX_FMT_GRAY8 has been declared as a paletted
    format in FFmpeg r22191, fix GRAY8 -> RGB conversion.
    
    Originally committed as revision 30826 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 689233c..83607d2 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1849,6 +1849,8 @@ int sws_scale(SwsContext *c, const uint8_t* const src[], const int srcStride[],
                 r= (i>>3    )*255;
                 g= ((i>>1)&3)*85;
                 b= (i&1     )*255;
+            } else if(c->srcFormat == PIX_FMT_GRAY8) {
+                r = g = b = i;
             } else {
                 assert(c->srcFormat == PIX_FMT_BGR4_BYTE);
                 b= (i>>3    )*255;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list