Mercurial > audlegacy-plugins
diff src/aac/libfaad2/sbr_qmf.c @ 691:e6c5fdae6e88 trunk
[svn] - oh yes, commit mplayer patches as well
author | nenolod |
---|---|
date | Tue, 20 Feb 2007 06:38:03 -0800 |
parents | 1d8b08df98c3 |
children | f1b6f1b2cdb3 |
line wrap: on
line diff
--- a/src/aac/libfaad2/sbr_qmf.c Tue Feb 20 06:31:29 2007 -0800 +++ b/src/aac/libfaad2/sbr_qmf.c Tue Feb 20 06:38:03 2007 -0800 @@ -1,33 +1,28 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003-2005 M. Bakker, Nero 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 ** the Free Software Foundation; either version 2 of the License, or ** (at your option) any later version. -** +** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. -** +** ** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly ** forbidden. ** -** Software using this code must display the following message visibly in or -** on each copy of the software: -** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com" -** in, for example, the about-box or help/startup screen. +** Commercial non-GPL licensing of this software is possible. +** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Nero AG through Mpeg4AAClicense@nero.com. -** -** $Id: sbr_qmf.c,v 1.30 2006/05/26 19:21:35 menno Exp $ +** $Id: sbr_qmf.c,v 1.27 2004/09/04 14:56:28 menno Exp $ **/ #include "common.h" @@ -77,7 +72,7 @@ #else ALIGN real_t y[32]; #endif - uint32_t in = 0; + uint16_t in = 0; uint8_t l; /* qmf subsample l */ @@ -256,7 +251,7 @@ { ALIGN real_t x[16]; ALIGN real_t y[16]; - int32_t n, k, out = 0; + int16_t n, k, out = 0; uint8_t l; /* qmf subsample l */ @@ -325,7 +320,7 @@ { ALIGN real_t x[64]; ALIGN real_t y[64]; - int32_t n, k, out = 0; + int16_t n, k, out = 0; uint8_t l; @@ -397,7 +392,7 @@ #ifndef FIXED_POINT real_t scale = 1.f/64.f; #endif - int32_t n, k, out = 0; + int16_t n, k, out = 0; uint8_t l; @@ -480,7 +475,7 @@ #ifndef FIXED_POINT real_t scale = 1.f/64.f; #endif - int32_t n, k, out = 0; + int16_t n, k, out = 0; uint8_t l;