# HG changeset patch # User alexc # Date 1257971636 0 # Node ID 06d6393bbaebf15372701424256087954d6c84c4 # Parent d7ac0d3ddd9586c504f484a7d5630d3fd7707375 AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the length of the section. diff -r d7ac0d3ddd95 -r 06d6393bbaeb aac.c --- a/aac.c Wed Nov 11 20:24:23 2009 +0000 +++ b/aac.c Wed Nov 11 20:33:56 2009 +0000 @@ -678,7 +678,7 @@ for (g = 0; g < ics->num_window_groups; g++) { int k = 0; while (k < ics->max_sfb) { - uint8_t sect_len = k; + uint8_t sect_end = k; int sect_len_incr; int sect_band_type = get_bits(gb, 4); if (sect_band_type == 12) { @@ -686,17 +686,17 @@ return -1; } while ((sect_len_incr = get_bits(gb, bits)) == (1 << bits) - 1) - sect_len += sect_len_incr; - sect_len += sect_len_incr; - if (sect_len > ics->max_sfb) { + sect_end += sect_len_incr; + sect_end += sect_len_incr; + if (sect_end > ics->max_sfb) { av_log(ac->avccontext, AV_LOG_ERROR, "Number of bands (%d) exceeds limit (%d).\n", - sect_len, ics->max_sfb); + sect_end, ics->max_sfb); return -1; } - for (; k < sect_len; k++) { + for (; k < sect_end; k++) { band_type [idx] = sect_band_type; - band_type_run_end[idx++] = sect_len; + band_type_run_end[idx++] = sect_end; } } }