From 86e41bc300d30ea2667a98f5581aee54a1c9312a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Tue, 6 Jul 2010 00:06:15 +0000
Subject: [PATCH] aacenc: replace VLA with fixed size
Number of channels is restricted to 6 so the size is acceptable
for the stack.
Originally committed as revision 24068 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/aacenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 1aaaf3ac9e0..387d0c2f9dc 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -41,6 +41,8 @@
#include "psymodel.h"
+#define AAC_MAX_CHANNELS 6
+
static const uint8_t swb_size_1024_96[] = {
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8,
12, 12, 12, 12, 12, 16, 16, 24, 28, 36, 44,
@@ -166,7 +168,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", avctx->sample_rate);
return -1;
}
- if (avctx->channels > 6) {
+ if (avctx->channels > AAC_MAX_CHANNELS) {
av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %d\n", avctx->channels);
return -1;
}
@@ -486,7 +488,7 @@ static int aac_encode_frame(AVCodecContext *avctx,
int i, j, chans, tag, start_ch;
const uint8_t *chan_map = aac_chan_configs[avctx->channels-1];
int chan_el_counter[4];
- FFPsyWindowInfo windows[avctx->channels];
+ FFPsyWindowInfo windows[AAC_MAX_CHANNELS];
if (s->last_frame)
return 0;
--
GitLab