Commit 9069b7d3 authored by Alex Converse's avatar Alex Converse

Fix declaration after statement

Originally committed as revision 23331 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 37dd2356
...@@ -566,13 +566,14 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, ...@@ -566,13 +566,14 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
if (nz) { if (nz) {
int minscale, maxscale; int minscale, maxscale;
float minrd = INFINITY; float minrd = INFINITY;
float maxval;
//minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped
minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512);
//maximum scalefactor index is when maximum coefficient after quantizing is still not zero //maximum scalefactor index is when maximum coefficient after quantizing is still not zero
maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512);
minscale = av_clip(minscale - q0, 0, TRELLIS_STATES - 1); minscale = av_clip(minscale - q0, 0, TRELLIS_STATES - 1);
maxscale = av_clip(maxscale - q0, 0, TRELLIS_STATES); maxscale = av_clip(maxscale - q0, 0, TRELLIS_STATES);
float maxval = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], s->scoefs+start); maxval = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], s->scoefs+start);
for (q = minscale; q < maxscale; q++) { for (q = minscale; q < maxscale; q++) {
float dist = 0; float dist = 0;
int cb = find_min_book(maxval, sce->sf_idx[w*16+g]); int cb = find_min_book(maxval, sce->sf_idx[w*16+g]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment