diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
| commit | e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8 (patch) | |
| tree | 8553b3a4ef8164d14ff1b4a3f67e57cfa1d8908a /libfaad2/sbr_huff.c | |
| parent | 2887bacbdb6bd320e4840fd230e92a59cc74b9ae (diff) | |
| download | mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.bz2 mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.xz | |
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
patch by adland <adland123 at yahoo dot com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/sbr_huff.c')
| -rw-r--r-- | libfaad2/sbr_huff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libfaad2/sbr_huff.c b/libfaad2/sbr_huff.c index 64053d9dca..8b317237af 100644 --- a/libfaad2/sbr_huff.c +++ b/libfaad2/sbr_huff.c @@ -23,7 +23,7 @@ ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 -** $Id: sbr_huff.c,v 1.3 2004/06/02 22:59:03 diego Exp $ +** $Id: sbr_huff.c,v 1.4 2004/06/23 13:50:52 diego Exp $ ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -192,7 +192,6 @@ static const int8_t f_huffman_env_bal_3_0dB[24][2] = { { -57, -56 }, { 22, 23 }, { -55, -54 }, { -53, -52 } }; - static const int8_t t_huffman_noise_3_0dB[62][2] = { { -64, 1 }, { -63, 2 }, { -65, 3 }, { -66, 4 }, { -62, 5 }, { -67, 6 }, { 7, 8 }, { -61, -68 }, @@ -229,7 +228,7 @@ static INLINE int16_t sbr_huff_dec(bitfile *ld, sbr_huff_tab t_huff) while (index >= 0) { - bit = (uint8_t)faad_getbits(ld, 1); + bit = (uint8_t)faad_get1bit(ld); index = t_huff[index][bit]; } |