aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-06-24 09:02:44 +0000
committerMåns Rullgård <mans@mansr.com>2010-06-24 09:02:44 +0000
commit796cea09b651e74a0efd162983036524a66d7791 (patch)
treebffd690aa182e3e5a89d9f62a3a00f42f3d00e99
parent89c7d8058cd4147ac255614cdcd6568bacdacf97 (diff)
downloadffmpeg-796cea09b651e74a0efd162983036524a66d7791.tar.gz
vp6: convert VLA to fixed size
Originally committed as revision 23754 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vp6.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 58c31f965b..f8bcd4be37 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -36,6 +36,7 @@
#include "vp56data.h"
#include "vp6data.h"
+#define VP6_MAX_HUFF_SIZE 12
static void vp6_parse_coeff(VP56Context *s);
static void vp6_parse_coeff_huffman(VP56Context *s);
@@ -215,7 +216,7 @@ static int vp6_huff_cmp(const void *va, const void *vb)
static void vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[],
const uint8_t *map, unsigned size, VLC *vlc)
{
- Node nodes[2*size], *tmp = &nodes[size];
+ Node nodes[2*VP6_MAX_HUFF_SIZE], *tmp = &nodes[size];
int a, b, i;
/* first compute probabilities from model */