[SCM] libav/experimental: Move variable declaration to block where it is used and simplify code. Avoids a (incorrect) "possibly used uninitialized" warning, no measurable speed difference.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 836fc7778513fa97c1852444155f82627ecbb8cd
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Thu Jan 28 21:01:50 2010 +0000

    Move variable declaration to block where it is used and simplify code.
    Avoids a (incorrect) "possibly used uninitialized" warning, no measurable
    speed difference.
    
    Originally committed as revision 21518 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index ac57f4a..f6eb12c 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -192,7 +192,7 @@ static int mpc7_decode_frame(AVCodecContext * avctx,
     MPCContext *c = avctx->priv_data;
     GetBitContext gb;
     uint8_t *bits;
-    int i, ch, t;
+    int i, ch;
     int mb = -1;
     Band *bands = c->bands;
     int off;
@@ -211,8 +211,9 @@ static int mpc7_decode_frame(AVCodecContext * avctx,
     /* read subband indexes */
     for(i = 0; i <= c->maxbands; i++){
         for(ch = 0; ch < 2; ch++){
+            int t = 4;
             if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
-            if(!i || (t == 4)) bands[i].res[ch] = get_bits(&gb, 4);
+            if(t == 4) bands[i].res[ch] = get_bits(&gb, 4);
             else bands[i].res[ch] = bands[i-1].res[ch] + t;
         }
 

-- 
Libav/FFmpeg packaging