Mercurial > mplayer.hg
comparison libfaad2/hcr.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 |
comparison
equal
deleted
inserted
replaced
13452:c364b7c13dd8 | 13453:6d50ef45a058 |
---|---|
21 ** | 21 ** |
22 ** Commercial non-GPL licensing of this software is possible. | 22 ** Commercial non-GPL licensing of this software is possible. |
23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | 23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. |
24 ** | 24 ** |
25 ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 | 25 ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 |
26 ** $Id: hcr.c,v 1.3 2004/06/02 22:59:03 diego Exp $ | 26 ** $Id: hcr.c,v 1.4 2004/06/23 13:50:50 diego Exp $ |
27 ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ | 27 ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ |
28 **/ | 28 **/ |
29 | 29 |
30 #include "common.h" | 30 #include "common.h" |
31 #include "structs.h" | 31 #include "structs.h" |
142 } codeword_state; | 142 } codeword_state; |
143 | 143 |
144 | 144 |
145 #define segmentWidth( codebook ) min( maxCwLen[codebook], ics->length_of_longest_codeword ) | 145 #define segmentWidth( codebook ) min( maxCwLen[codebook], ics->length_of_longest_codeword ) |
146 | 146 |
147 uint8_t reordered_spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld, | 147 uint8_t reordered_spectral_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld, |
148 int16_t *spectral_data) | 148 int16_t *spectral_data) |
149 { | 149 { |
150 uint16_t sp_offset[8]; | 150 uint16_t sp_offset[8]; |
151 uint16_t g,i, presort; | 151 uint16_t g,i, presort; |
152 uint16_t NrCodeWords=0, numberOfSegments=0, BitsRead=0; | 152 uint16_t NrCodeWords=0, numberOfSegments=0, BitsRead=0; |