[SCM] libav/experimental: 100l fix if condition

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:16:27 UTC 2013


The following commit has been merged in the experimental branch:
commit bd8154d0b337e7a9f4dd1a728f4409fbe37c8fea
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Sep 27 23:47:54 2010 +0000

    100l fix if condition
    
    Originally committed as revision 32395 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index aa400f6..375171f 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1941,7 +1941,7 @@ 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 || PIX_FMT_Y400A) {
+            } else if(c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_Y400A) {
                 r = g = b = i;
             } else {
                 assert(c->srcFormat == PIX_FMT_BGR4_BYTE);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list