diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-08-25 13:58:27 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-08-25 13:58:27 +0000 |
| commit | 14168ddb285a6e76a173f49b69e1ae5d80a7bf62 (patch) | |
| tree | da7a0f394a031c7f9858b4e8ca1ead086db3f53b /libavcodec/mpegaudiodec.c | |
| parent | bc2d2757bb532fa260c373adb00f4e47766e3449 (diff) | |
move variable declarations so that their scope is smaller
Originally committed as revision 6087 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 7e27f75f50..dc5e6ca1ea 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1679,13 +1679,14 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, int16_t *exponents, int end_pos) { int s_index; - int linbits, code, x, y, l, v, i, j, k, pos; + int i; int last_pos; VLC *vlc; /* low frequencies (called big values) */ s_index = 0; for(i=0;i<3;i++) { + int j, k, l, linbits; j = g->region_size[i]; if (j == 0) continue; @@ -1703,7 +1704,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, /* read huffcode and compute each couple */ for(;j>0;j--) { - int exponent; + int exponent, x, y, v; if (get_bits_count(&s->gb) >= end_pos) break; @@ -1768,6 +1769,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, vlc = &huff_quad_vlc[g->count1table_select]; last_pos=0; while (s_index <= 572) { + int pos, code; pos = get_bits_count(&s->gb); if (pos >= end_pos) { if (pos > end_pos && last_pos){ @@ -1789,6 +1791,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, g->sb_hybrid[s_index+3]= 0; while(code){ const static int idxtab[16]={3,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0}; + int v; int pos= s_index+idxtab[code]; code ^= 8>>idxtab[code]; v = exp_table[ exponents[pos] ]; |