diff options
Diffstat (limited to 'tremor/sharedbook.c')
| -rw-r--r-- | tremor/sharedbook.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tremor/sharedbook.c b/tremor/sharedbook.c index afc83e7386..a62211eed6 100644 --- a/tremor/sharedbook.c +++ b/tremor/sharedbook.c @@ -2,9 +2,12 @@ * * * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * * * + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * + * * * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 * * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * - * ALL REDISTRIBUTION RIGHTS RESERVED. * * * ******************************************************************** @@ -208,7 +211,7 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap, int indexdiv=1; for(k=0;k<b->dim;k++){ int index= (j/indexdiv)%quantvals; - ogg_int32_t point; + int point; int val=VFLOAT_MULTI(delta,delpoint, abs(b->quantlist[index]),&point); @@ -242,7 +245,7 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap, int lastpoint=0; for(k=0;k<b->dim;k++){ - ogg_int32_t point; + int point; int val=VFLOAT_MULTI(delta,delpoint, abs(b->quantlist[j*b->dim+k]),&point); @@ -313,7 +316,8 @@ static ogg_uint32_t bitreverse(ogg_uint32_t x){ } static int sort32a(const void *a,const void *b){ - return ( (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)<<1)-1; + return (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)- + (**(ogg_uint32_t **)a<**(ogg_uint32_t **)b); } /* decode codebook arrangement is more heavily optimized than encode */ |