From 3715d841a619f1cbc4776d9b00575dae6fb6534a Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 29 Jan 2012 20:55:10 +0000 Subject: Fix non-C89 declarations in for loops Some compilers still do not support this syntax. Signed-off-by: Mans Rullgard --- libavcodec/aacenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/aacenc.c') diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index e610a8006f..1957420d00 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -223,8 +223,9 @@ WINDOW_FUNC(eight_short) const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; const float *in = audio + 448; float *out = sce->ret; + int w; - for (int w = 0; w < 8; w++) { + for (w = 0; w < 8; w++) { dsp->vector_fmul (out, in, w ? pwindow : swindow, 128); out += 128; in += 128; @@ -686,11 +687,12 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s) { + int ch; FF_ALLOCZ_OR_GOTO(avctx, s->buffer.samples, 3 * 1024 * s->channels * sizeof(s->buffer.samples[0]), alloc_fail); FF_ALLOCZ_OR_GOTO(avctx, s->cpe, sizeof(ChannelElement) * s->chan_map[0], alloc_fail); FF_ALLOCZ_OR_GOTO(avctx, avctx->extradata, 5 + FF_INPUT_BUFFER_PADDING_SIZE, alloc_fail); - for(int ch = 0; ch < s->channels; ch++) + for(ch = 0; ch < s->channels; ch++) s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch; return 0; -- cgit v1.2.3