From bad41d3724228cf9b03973a68cf3082adffb48f8 Mon Sep 17 00:00:00 2001 From: Claudio Freire Date: Sun, 3 Apr 2016 15:03:53 -0300 Subject: AAC encoder: fix initialization of minsf In some situations (exactly zeroed DC coeffs) minsf would be initialized with garbage --- libavcodec/aaccoder_twoloop.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/aaccoder_twoloop.h') diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h index 41d3ffd8a0..42aea52000 100644 --- a/libavcodec/aaccoder_twoloop.h +++ b/libavcodec/aaccoder_twoloop.h @@ -302,10 +302,11 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, const float *scaled = s->scoefs + start; int minsfidx; maxvals[w*16+g] = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled); - if (maxvals[w*16+g] > 0) + if (maxvals[w*16+g] > 0) { minsfidx = coef2minsf(maxvals[w*16+g]); - for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) - minsf[(w+w2)*16+g] = minsfidx; + for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) + minsf[(w+w2)*16+g] = minsfidx; + } start += sce->ics.swb_sizes[g]; } } -- cgit v1.2.3