From 025873738f365417870af9fb9ccd0a4da74564b7 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 27 Sep 2009 06:38:13 +0000 Subject: [PATCH] Cosmetics: Rename some variables. Originally committed as revision 20052 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ac3dec.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 883aa7fdb1..cbeac311c3 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -412,18 +412,18 @@ static int decode_exponents(GetBitContext *gbc, int exp_strategy, int ngrps, */ static void calc_transform_coeffs_cpl(AC3DecodeContext *s) { - int i, j, ch, bnd; + int bin, band, ch, band_end; - i = s->start_freq[CPL_CH]; - for(bnd=0; bndnum_cpl_bands; bnd++) { - j = i + s->cpl_band_sizes[bnd]; - for (; i < j; i++) { - for(ch=1; ch<=s->fbw_channels; ch++) { - if(s->channel_in_cpl[ch]) { - s->fixed_coeffs[ch][i] = ((int64_t)s->fixed_coeffs[CPL_CH][i] * - (int64_t)s->cpl_coords[ch][bnd]) >> 23; - if (ch == 2 && s->phase_flags[bnd]) - s->fixed_coeffs[ch][i] = -s->fixed_coeffs[ch][i]; + bin = s->start_freq[CPL_CH]; + for (band = 0; band < s->num_cpl_bands; band++) { + band_end = bin + s->cpl_band_sizes[band]; + for (; bin < band_end; bin++) { + for (ch = 1; ch <= s->fbw_channels; ch++) { + if (s->channel_in_cpl[ch]) { + s->fixed_coeffs[ch][bin] = ((int64_t)s->fixed_coeffs[CPL_CH][bin] * + (int64_t)s->cpl_coords[ch][band]) >> 23; + if (ch == 2 && s->phase_flags[band]) + s->fixed_coeffs[ch][bin] = -s->fixed_coeffs[ch][bin]; } } }