diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-19 18:58:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 18:58:22 +0200 |
| commit | 7bdccc19119cec273f46d4d3b1be72f87049749a (patch) | |
| tree | 396b6824fb638cb7f97f074d2975e9b3c899b08d /drivers/vorbis/codebook.h | |
| parent | 5cb31f6d5b667a551092b699de6f4786e0bb5b6d (diff) | |
| parent | 214f316cf9c861a0083cf74b790760aab77cb2ea (diff) | |
Merge pull request #5292 from J08nY/external-lib-update
External lib update: libogg, libvorbis, libtheora
Diffstat (limited to 'drivers/vorbis/codebook.h')
| -rw-r--r-- | drivers/vorbis/codebook.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/vorbis/codebook.h b/drivers/vorbis/codebook.h index 94c30054cf..537d6c12d3 100644 --- a/drivers/vorbis/codebook.h +++ b/drivers/vorbis/codebook.h @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: basic shared codebook operations - last mod: $Id: codebook.h 17030 2010-03-25 06:52:55Z xiphmont $ + last mod: $Id: codebook.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -34,14 +34,14 @@ */ typedef struct static_codebook{ - long dim; /* codebook dimensions (elements per vector) */ - long entries; /* codebook entries */ - long *lengthlist; /* codeword lengths in bits */ + long dim; /* codebook dimensions (elements per vector) */ + long entries; /* codebook entries */ + char *lengthlist; /* codeword lengths in bits */ /* mapping ***************************************************************/ - int maptype; /* 0=none - 1=implicitly populated values from map column - 2=listed arbitrary values */ + int maptype; /* 0=none + 1=implicitly populated values from map column + 2=listed arbitrary values */ /* The below does a linear, single monotonic sequence mapping. */ long q_min; /* packed 32 bit float; quant value 0 maps to minval */ @@ -89,7 +89,6 @@ extern float *_book_logdist(const static_codebook *b,float *vals); extern float _float32_unpack(long val); extern long _float32_pack(float val); extern int _best(codebook *book, float *a, int step); -extern int _ilog(unsigned int v); extern long _book_maptype1_quantvals(const static_codebook *b); extern int vorbis_book_besterror(codebook *book,float *a,int step,int addmul); |