From d6446d0b08c62c7258793603f4cc7c027b0043a1 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sat, 17 Jul 2010 08:33:36 +0000 Subject: Begin shoehorning wma into the clip codec buffer again. Reduce the static buffer used by init_vlc so that it is no larger than is needed. Make the VLCcode struct packed to save space. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27457 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/lib/ffmpeg_bitstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/codecs/lib/ffmpeg_bitstream.c b/apps/codecs/lib/ffmpeg_bitstream.c index 542f2671e5..e16df8dcce 100644 --- a/apps/codecs/lib/ffmpeg_bitstream.c +++ b/apps/codecs/lib/ffmpeg_bitstream.c @@ -146,7 +146,7 @@ typedef struct { /** codeword, with the first bit-to-be-read in the msb * (even if intended for a little-endian bitstream reader) */ uint32_t code; -} VLCcode; +} __attribute__((__packed__)) VLCcode; /* packed to save space */ static int compare_vlcspec(const void *a, const void *b) { @@ -291,7 +291,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, out above (bitswap_32) and an inline asm version in libtremor/codebook.c if we ever want this */ -static VLCcode buf[1500]; /* worst case is wma, which has one table with 1336 entries */ +static VLCcode buf[1336+1]; /* worst case is wma, which has one table with 1336 entries */ int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, const void *bits, int bits_wrap, int bits_size, -- cgit v1.2.3