OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66d3666
)
avcodec/aacenc: Fix "libavcodec/aacenc.c:540:13: warning: ISO C90 forbids mixed decla...
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 17 Oct 2015 11:40:04 +0000
(13:40 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 17 Oct 2015 16:58:11 +0000
(18:58 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/aacenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacenc.c
b/libavcodec/aacenc.c
index
78eaf40
..
796038c
100644
(file)
--- 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);