diff options
| author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-12-03 01:15:29 +0000 |
|---|---|---|
| committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-12-03 01:15:29 +0000 |
| commit | 177aca572a9e0f4256034e51ffded0b3815d4f61 (patch) | |
| tree | 071a5f96a627a1c0124ff57a4b806d52068fdba0 /src/libfaad/decoder.c | |
| parent | 575782a9f76583abd8c4374466472b376023f8dd (diff) | |
| download | xine-lib-177aca572a9e0f4256034e51ffded0b3815d4f61.tar.gz xine-lib-177aca572a9e0f4256034e51ffded0b3815d4f61.tar.bz2 | |
Update to libfaad2 2.0.
CVS patchset: 7185
CVS date: 2004/12/03 01:15:29
Diffstat (limited to 'src/libfaad/decoder.c')
| -rw-r--r-- | src/libfaad/decoder.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/libfaad/decoder.c b/src/libfaad/decoder.c index 208e4f5e0..3a1dc86de 100644 --- a/src/libfaad/decoder.c +++ b/src/libfaad/decoder.c @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: decoder.c,v 1.8 2004/01/26 22:34:10 jstembridge Exp $ +** $Id: decoder.c,v 1.9 2004/12/03 01:15:30 tmattern Exp $ **/ #include "common.h" @@ -414,6 +414,7 @@ int8_t FAADAPI faacDecInitDRM(faacDecHandle hDecoder, uint32_t samplerate, /* Take care of buffers */ if (hDecoder->sample_buffer) faad_free(hDecoder->sample_buffer); hDecoder->sample_buffer = NULL; + hDecoder->alloced_channels = 0; for (i = 0; i < MAX_CHANNELS; i++) { @@ -440,13 +441,17 @@ int8_t FAADAPI faacDecInitDRM(faacDecHandle hDecoder, uint32_t samplerate, #endif } -#ifdef SBR_DEC for (i = 0; i < MAX_SYNTAX_ELEMENTS; i++) { +#ifdef SBR_DEC if (hDecoder->sbr[i]) sbrDecodeEnd(hDecoder->sbr[i]); - } + + hDecoder->sbr_alloced[i] = 0; #endif + hDecoder->element_alloced[i] = 0; + hDecoder->element_output_channels[i] = 0; + } hDecoder->fb = filter_bank_init(hDecoder->frameLength); |