projects
/
platform
/
upstream
/
libvorbis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change to a variable name in seed_peaks() to avoid a namespace collision on win32.
[platform/upstream/libvorbis.git]
/
lib
/
psy.c
diff --git
a/lib/psy.c
b/lib/psy.c
index
27bdff3
..
2fa763b
100644
(file)
--- a/
lib/psy.c
+++ b/
lib/psy.c
@@
-12,7
+12,7
@@
********************************************************************
function: psychoacoustics not including preecho
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.
19 2000/05/08 20:49:49 xiphmont
Exp $
+ last mod: $Id: psy.c,v 1.
20 2000/05/16 11:54:09 msmith
Exp $
********************************************************************/
********************************************************************/
@@
-349,7
+349,7
@@
static double _eights[EHMER_MAX+1]={
22.62741699796952076,24.67537320652705316,
26.90868528811886536,29.34412938254947939};
22.62741699796952076,24.67537320652705316,
26.90868528811886536,29.34412938254947939};
-static void seed_peaks(double *floor,
+static void seed_peaks(double *floor
curve
,
double **curves,
double amp,double specmax,
int x,int n,double specatt){
double **curves,
double amp,double specmax,
int x,int n,double specatt){
@@
-370,7
+370,7
@@
static void seed_peaks(double *floor,
nextx=(nextx<n?nextx:n);
if(lin){
lin*=amp;
nextx=(nextx<n?nextx:n);
if(lin){
lin*=amp;
- if(floor
[prevx]<lin)floor
[prevx]=lin;
+ if(floor
curve[prevx]<lin)floorcurve
[prevx]=lin;
}
prevx=nextx;
}
}
prevx=nextx;
}