# HG changeset patch # User alexc # Date 1275079321 0 # Node ID a211c41465f3d5866a20d173ccebdc6d2435c7cb # Parent 51abd780bda60e80e0b7055f17154d7908b14a2d aacenc: Remove unnecessary variables and scopes in the TLS. diff -r 51abd780bda6 -r a211c41465f3 aaccoder.c --- a/aaccoder.c Fri May 28 20:14:14 2010 +0000 +++ b/aaccoder.c Fri May 28 20:42:01 2010 +0000 @@ -696,17 +696,13 @@ const float *scaled = s->scoefs + start; int bits = 0; int cb; - float mindist = INFINITY; - int minbits = 0; + float dist = 0.0f; if (sce->zeroes[w*16+g] || sce->sf_idx[w*16+g] >= 218) { start += sce->ics.swb_sizes[g]; continue; } minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]); - { - float dist = 0.0f; - int bb = 0; cb = find_min_book(find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled), sce->sf_idx[w*16+g]); sce->band_type[w*16+g] = cb; for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { @@ -719,13 +715,9 @@ lambda, INFINITY, &b); - bb += b; + bits += b; } - mindist = dist; - minbits = bb; - } - dists[w*16+g] = (mindist - minbits) / lambda; - bits = minbits; + dists[w*16+g] = (dist - bits) / lambda; if (prev != -1) { bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO]; }