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/lt_predict.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/lt_predict.c')
| -rw-r--r-- | src/libfaad/lt_predict.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/libfaad/lt_predict.c b/src/libfaad/lt_predict.c index c81a62def..388d841c3 100644 --- a/src/libfaad/lt_predict.c +++ b/src/libfaad/lt_predict.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: lt_predict.c,v 1.3 2003/12/30 02:00:10 miguelfreitas Exp $ +** $Id: lt_predict.c,v 1.4 2004/01/11 15:44:05 mroi Exp $ **/ @@ -37,6 +37,11 @@ #include "filtbank.h" #include "tns.h" + +/* static function declarations */ +static int16_t real_to_int16(real_t sig_in); + + /* check if the object type is an object type that can have LTP */ uint8_t is_ltp_ot(uint8_t object_type) { @@ -128,7 +133,7 @@ void lt_prediction(ic_stream *ics, ltp_info *ltp, real_t *spec, } #ifdef FIXED_POINT -INLINE int16_t real_to_int16(real_t sig_in) +static INLINE int16_t real_to_int16(real_t sig_in) { if (sig_in >= 0) { @@ -144,7 +149,7 @@ INLINE int16_t real_to_int16(real_t sig_in) return (sig_in >> REAL_BITS); } #else -INLINE int16_t real_to_int16(real_t sig_in) +static INLINE int16_t real_to_int16(real_t sig_in) { if (sig_in >= 0) { |