OSDN Git Service

Silence GCC warnings:
authorVitor Sessak <vitor1001@gmail.com>
Mon, 27 Oct 2008 19:59:01 +0000 (19:59 +0000)
committerVitor Sessak <vitor1001@gmail.com>
Mon, 27 Oct 2008 19:59:01 +0000 (19:59 +0000)
ibswscale/swscale.c: In function ‘sws_scale’:
libswscale/swscale.c:2678: warning: ‘b’ may be used uninitialized in
this function
libswscale/swscale.c:2678: warning: ‘g’ may be used uninitialized in
this function
libswscale/swscale.c:2678: warning: ‘r’ may be used uninitialized in
this function

Originally committed as revision 27837 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

libswscale/swscale.c

index a399ee9..577d093 100644 (file)
@@ -2734,7 +2734,8 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
                 r= (i>>3    )*255;
                 g= ((i>>1)&3)*85;
                 b= (i&1     )*255;
-            }else if(c->srcFormat == PIX_FMT_BGR4_BYTE){
+            }else {
+                assert(c->srcFormat == PIX_FMT_BGR4_BYTE);
                 b= (i>>3    )*255;
                 g= ((i>>1)&3)*85;
                 r= (i&1     )*255;