[FFmpeg-devel] [PATCH] vp6: convert VLA to fixed size

[Måns Rullgård]

Aurelien Jacobs <aurel at gnuage.org> writes:

> On Wed, Jun 23, 2010 at 10:16:10PM +0100, Mans Rullgard wrote:
>> ---
>>  libavcodec/vp6.c |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>> 
>> diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
>> index 58c31f9..f8bcd4b 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;
>
> Looks OK.

Applied.

-- 
M?ns Rullg?rd
mans at mansr.com