From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 17 Oct 2015 11:40:04 +0000 (+0200)
Subject: avcodec/aacenc: Fix "libavcodec/aacenc.c:540:13: warning: ISO C90 forbids mixed decla... 
X-Git-Tag: android-x86-7.1-r1~8432
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c38a6077eea88470280f854a73d17ff25777da29;p=android-x86%2Fexternal-ffmpeg.git

avcodec/aacenc: Fix "libavcodec/aacenc.c:540:13: warning: ISO C90 forbids mixed declarations and code"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 78eaf405b9..796038c0da 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -534,10 +534,10 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         chans    = tag == TYPE_CPE ? 2 : 1;
         cpe      = &s->cpe[i];
         for (ch = 0; ch < chans; ch++) {
+            float clip_avoidance_factor;
             sce = &cpe->ch[ch];
             ics = &sce->ics;
             s->cur_channel = start_ch + ch;
-            float clip_avoidance_factor;
             overlap  = &samples[s->cur_channel][0];
             samples2 = overlap + 1024;
             la       = samples2 + (448+64);