Mercurial > mplayer.hg
diff libfaad2/huffman.c @ 13453:6d50ef45a058
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
patch by adland <adland123 at yahoo dot com>
| author | diego |
|---|---|
| date | Fri, 24 Sep 2004 17:31:36 +0000 |
| parents | d81145997036 |
| children | 2ae5ab4331ca |
line wrap: on
line diff
--- a/libfaad2/huffman.c Fri Sep 24 17:03:03 2004 +0000 +++ b/libfaad2/huffman.c Fri Sep 24 17:31:36 2004 +0000 @@ -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 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 @@ } } - off = faad_getbits(ld, i + off = (int16_t)faad_getbits(ld, i DEBUGVAR(1,9,"huffman_getescape(): escape")); j = off | (1<<i);