[FFmpeg-cvslog] AAC encoder: fix initialization of minsf

Claudio Freire git at videolan.org
Sun Apr 3 20:04:00 CEST 2016


ffmpeg | branch: master | Claudio Freire <klaussfreire at gmail.com> | Sun Apr  3 15:03:53 2016 -0300| [bad41d3724228cf9b03973a68cf3082adffb48f8] | committer: Claudio Freire

AAC encoder: fix initialization of minsf

In some situations (exactly zeroed DC coeffs) minsf would
be initialized with garbage

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bad41d3724228cf9b03973a68cf3082adffb48f8
---

 libavcodec/aaccoder_twoloop.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h
index 41d3ffd..42aea52 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];
         }
     }



More information about the ffmpeg-cvslog mailing list