[FFmpeg-cvslog] r23774 - in trunk/libavcodec: rv34.c rv34vlc.h

[mru]

Author: mru
Date: Fri Jun 25 10:19:20 2010
New Revision: 23774

Log:
rv34: kill VLAs

Modified:
   trunk/libavcodec/rv34.c
   trunk/libavcodec/rv34vlc.h

Modified: trunk/libavcodec/rv34.c
==============================================================================
--- trunk/libavcodec/rv34.c	Fri Jun 25 10:03:52 2010	(r23773)
+++ trunk/libavcodec/rv34.c	Fri Jun 25 10:19:20 2010	(r23774)
@@ -103,8 +103,8 @@ static void rv34_gen_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++){

Modified: trunk/libavcodec/rv34vlc.h
==============================================================================
--- trunk/libavcodec/rv34vlc.h	Fri Jun 25 10:03:52 2010	(r23773)
+++ trunk/libavcodec/rv34vlc.h	Fri Jun 25 10:19:20 2010	(r23774)
@@ -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] = {
   {