diff options
| author | Monty <xiphmont@xiph.org> | 2000-03-29 20:08:49 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 2000-03-29 20:08:49 +0000 |
| commit | 58295f73ba5136dfdf4543d0362fe3abd24ad9d1 (patch) | |
| tree | 8bdcbfb06cfa01327b2cabc5adb5f824f9c8ae2b | |
| parent | 38a19fa1a830005b8d02cb8505da8f5bf374cdc8 (diff) | |
| download | libvorbis-git-unlabeled-1.11.2.tar.gz | |
Incremental updateunlabeled-1.11.2
svn path=/branches/unlabeled-1.11.2/vorbis/; revision=287
| -rw-r--r-- | lib/mapping0.c | 4 | ||||
| -rw-r--r-- | lib/psy.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/mapping0.c b/lib/mapping0.c index 7baf9b78..59c895ec 100644 --- a/lib/mapping0.c +++ b/lib/mapping0.c @@ -12,7 +12,7 @@ ******************************************************************** function: channel mapping 0 implementation - last mod: $Id: mapping0.c,v 1.11.2.1 2000/03/29 03:49:28 xiphmont Exp $ + last mod: $Id: mapping0.c,v 1.11.2.2 2000/03/29 20:08:49 xiphmont Exp $ ********************************************************************/ @@ -240,7 +240,7 @@ static int forward(vorbis_block *vb,vorbis_look_mapping *l){ /* perform psychoacoustics; do masking */ /*memset(mask,0,sizeof(double)*n/2);*/ _vp_tone_tone_mask(look->psy_look+submap,pcm,mask, - 1,1,1,decay); + 1,1,decay); /* perform floor encoding */ @@ -12,7 +12,7 @@ ******************************************************************** function: random psychoacoustics (not including preecho) - last mod: $Id: psy.h,v 1.11.2.1 2000/03/29 03:49:28 xiphmont Exp $ + last mod: $Id: psy.h,v 1.11.2.2 2000/03/29 20:08:49 xiphmont Exp $ ********************************************************************/ @@ -42,8 +42,7 @@ extern void _vp_psy_clear(vorbis_look_psy *p); extern void *_vi_psy_dup(void *source); extern void _vi_psy_free(vorbis_info_psy *i); extern void _vp_tone_tone_mask(vorbis_look_psy *p,double *f, double *floor, - int athp, int addp, int decayp, - double *decay); + int athp, int decayp, double *decay); #endif |