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/mdct.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/mdct.c')
| -rw-r--r-- | src/libfaad/mdct.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libfaad/mdct.c b/src/libfaad/mdct.c index 6c4d3edd7..afa27b990 100644 --- a/src/libfaad/mdct.c +++ b/src/libfaad/mdct.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: mdct.c,v 1.7 2003/12/30 02:00:10 miguelfreitas Exp $ +** $Id: mdct.c,v 1.8 2004/01/11 15:44:05 mroi Exp $ **/ /* @@ -119,7 +119,8 @@ real_t const_tab[][5] = }; #endif -uint8_t map_N_to_idx(uint16_t N) +#ifdef FIXED_POINT +static uint8_t map_N_to_idx(uint16_t N) { /* gives an index into const_tab above */ /* for normal AAC deocding (eg. no scalable profile) only */ @@ -139,6 +140,7 @@ uint8_t map_N_to_idx(uint16_t N) } return 0; } +#endif mdct_info *faad_mdct_init(uint16_t N) { |