From 9bfb72d9e9e1dba3478e6ff2d2e25c16fe01cf7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Fri, 25 Jun 2010 08:19:20 +0000 Subject: [PATCH] rv34: kill VLAs Originally committed as revision 23774 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rv34.c | 4 ++-- libavcodec/rv34vlc.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 88652f9..fa3f23f 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -103,8 +103,8 @@ static void rv34_gen_vlc(const uint8_t *bits, int size, VLC *vlc, const uint8_t { int i; int counts[17] = {0}, codes[17]; - uint16_t cw[size], syms[size]; - uint8_t bits2[size]; + uint16_t cw[MAX_VLC_SIZE], syms[MAX_VLC_SIZE]; + uint8_t bits2[MAX_VLC_SIZE]; int maxbits = 0, realsize = 0; for(i = 0; i < size; i++){ diff --git a/libavcodec/rv34vlc.h b/libavcodec/rv34vlc.h index 2b89e4c..aa29357 100644 --- a/libavcodec/rv34vlc.h +++ b/libavcodec/rv34vlc.h @@ -37,6 +37,7 @@ #define FIRSTBLK_VLC_SIZE 864 #define OTHERBLK_VLC_SIZE 108 #define COEFF_VLC_SIZE 32 +#define MAX_VLC_SIZE 1296 static const uint8_t rv34_table_intra_cbppat[NUM_INTRA_TABLES][2][CBPPAT_VLC_SIZE] = { { -- 2.7.4