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/huffman.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/huffman.c')
| -rw-r--r-- | libfaad2/huffman.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libfaad2/huffman.c b/libfaad2/huffman.c index 51df964941..511a7f9e17 100644 --- a/libfaad2/huffman.c +++ b/libfaad2/huffman.c @@ -23,7 +23,7 @@ ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** ** Initially modified for use with MPlayer by Alex Beregszaszi on 2003/10/03 -** $Id: huffman.c,v 1.2 2004/06/02 22:59:03 diego Exp $ +** $Id: huffman.c,v 1.3 2004/06/23 13:50:50 diego Exp $ ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -122,8 +122,8 @@ static INLINE void huffman_sign_bits(bitfile *ld, int16_t *sp, uint8_t len) static INLINE int16_t huffman_getescape(bitfile *ld, int16_t sp) { uint8_t neg, i; - int32_t j; - int32_t off; + int16_t j; + int16_t off; if (sp < 0) { @@ -145,7 +145,7 @@ static INLINE int16_t huffman_getescape(bitfile *ld, int16_t sp) } } - off = faad_getbits(ld, i + off = (int16_t)faad_getbits(ld, i DEBUGVAR(1,9,"huffman_getescape(): escape")); j = off | (1<<i); |