diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-01-11 15:44:04 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-01-11 15:44:04 +0000 |
| commit | ba65efaad16ddd1347de7af98f9494cee7a39419 (patch) | |
| tree | 630d2e9b4581f45cbe85815ec881705be9cc045b /src/libfaad/sbr_fbt.c | |
| parent | 14019fd4a433078fb4466e910cd432489dd60bbc (diff) | |
| download | xine-lib-ba65efaad16ddd1347de7af98f9494cee7a39419.tar.gz xine-lib-ba65efaad16ddd1347de7af98f9494cee7a39419.tar.bz2 | |
the faad project accepted a huge compiler warning patch I sent them,
merging their CVS back to our copy
everyone please check, if your AAC samples still work
CVS patchset: 6024
CVS date: 2004/01/11 15:44:04
Diffstat (limited to 'src/libfaad/sbr_fbt.c')
| -rw-r--r-- | src/libfaad/sbr_fbt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libfaad/sbr_fbt.c b/src/libfaad/sbr_fbt.c index 88a2b29f2..b18536b69 100644 --- a/src/libfaad/sbr_fbt.c +++ b/src/libfaad/sbr_fbt.c @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: sbr_fbt.c,v 1.1 2003/12/30 02:00:10 miguelfreitas Exp $ +** $Id: sbr_fbt.c,v 1.2 2004/01/11 15:44:05 mroi Exp $ **/ /* Calculate frequency band tables */ @@ -37,6 +37,10 @@ #include "sbr_syntax.h" #include "sbr_fbt.h" +/* static function declarations */ +static int32_t find_bands(uint8_t warp, uint8_t bands, uint8_t a0, uint8_t a1); + + /* calculate the start QMF channel for the master frequency band table */ /* parameter is also called k0 */ uint8_t qmf_start_channel(uint8_t bs_start_freq, uint8_t bs_samplerate_mode, |