Index: libvorbis-1.2.0/lib/masking.h
===================================================================
--- libvorbis-1.2.0.orig/lib/masking.h
+++ libvorbis-1.2.0/lib/masking.h
@@ -22,7 +22,7 @@
    overly for only a bin or two of savings. */
 
 #define MAX_ATH 88
-static float ATH[]={
+static const float ATH[]={
   /*15*/  -51, -52, -53, -54, -55, -56, -57, -58,  
   /*31*/  -59, -60, -61, -62, -63, -64, -65, -66,
   /*63*/  -67, -68, -69, -70, -71, -72, -73, -74, 
@@ -48,7 +48,7 @@ static float ATH[]={
 /* (Vorbis 0dB, the loudest possible tone, is assumed to be ~100dB SPL
    for collection of these curves) */
 
-static float tonemasks[P_BANDS][6][EHMER_MAX]={
+static const float tonemasks[P_BANDS][6][EHMER_MAX]={
   /* 62.5 Hz */
   {{ -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60, 
      -60,  -60,  -60,  -60,  -62,  -62,  -65,  -73, 
Index: libvorbis-1.2.0/lib/registry.c
===================================================================
--- libvorbis-1.2.0.orig/lib/registry.c
+++ libvorbis-1.2.0/lib/registry.c
@@ -22,25 +22,25 @@
 /* seems like major overkill now; the backend numbers will grow into
    the infrastructure soon enough */
 
-extern vorbis_func_floor     floor0_exportbundle;
-extern vorbis_func_floor     floor1_exportbundle;
-extern vorbis_func_residue   residue0_exportbundle;
-extern vorbis_func_residue   residue1_exportbundle;
-extern vorbis_func_residue   residue2_exportbundle;
-extern vorbis_func_mapping   mapping0_exportbundle;
+extern const vorbis_func_floor     floor0_exportbundle;
+extern const vorbis_func_floor     floor1_exportbundle;
+extern const vorbis_func_residue   residue0_exportbundle;
+extern const vorbis_func_residue   residue1_exportbundle;
+extern const vorbis_func_residue   residue2_exportbundle;
+extern const vorbis_func_mapping   mapping0_exportbundle;
 
-vorbis_func_floor     *_floor_P[]={
+const vorbis_func_floor     *const _floor_P[]={
   &floor0_exportbundle,
   &floor1_exportbundle,
 };
 
-vorbis_func_residue   *_residue_P[]={
+const vorbis_func_residue   *const _residue_P[]={
   &residue0_exportbundle,
   &residue1_exportbundle,
   &residue2_exportbundle,
 };
 
-vorbis_func_mapping   *_mapping_P[]={
+const vorbis_func_mapping   *const _mapping_P[]={
   &mapping0_exportbundle,
 };
 
Index: libvorbis-1.2.0/lib/window.c
===================================================================
--- libvorbis-1.2.0.orig/lib/window.c
+++ libvorbis-1.2.0/lib/window.c
@@ -20,7 +20,7 @@
 #include "os.h"
 #include "misc.h"
 
-static float vwin64[32] = {
+static const float vwin64[32] = {
   0.0009460463F, 0.0085006468F, 0.0235352254F, 0.0458950567F, 
   0.0753351908F, 0.1115073077F, 0.1539457973F, 0.2020557475F, 
   0.2551056759F, 0.3122276645F, 0.3724270287F, 0.4346027792F, 
@@ -31,7 +31,7 @@ static float vwin64[32] = {
   0.9989462667F, 0.9997230082F, 0.9999638688F, 0.9999995525F, 
 };
 
-static float vwin128[64] = {
+static const float vwin128[64] = {
   0.0002365472F, 0.0021280687F, 0.0059065254F, 0.0115626550F, 
   0.0190823442F, 0.0284463735F, 0.0396300935F, 0.0526030430F, 
   0.0673285281F, 0.0837631763F, 0.1018564887F, 0.1215504095F, 
@@ -50,7 +50,7 @@ static float vwin128[64] = {
   0.9999331503F, 0.9999825563F, 0.9999977357F, 0.9999999720F, 
 };
 
-static float vwin256[128] = {
+static const float vwin256[128] = {
   0.0000591390F, 0.0005321979F, 0.0014780301F, 0.0028960636F, 
   0.0047854363F, 0.0071449926F, 0.0099732775F, 0.0132685298F, 
   0.0170286741F, 0.0212513119F, 0.0259337111F, 0.0310727950F, 
@@ -85,7 +85,7 @@ static float vwin256[128] = {
   0.9999958064F, 0.9999989077F, 0.9999998584F, 0.9999999983F, 
 };
 
-static float vwin512[256] = {
+static const float vwin512[256] = {
   0.0000147849F, 0.0001330607F, 0.0003695946F, 0.0007243509F, 
   0.0011972759F, 0.0017882983F, 0.0024973285F, 0.0033242588F, 
   0.0042689632F, 0.0053312973F, 0.0065110982F, 0.0078081841F, 
@@ -152,7 +152,7 @@ static float vwin512[256] = {
   0.9999997377F, 0.9999999317F, 0.9999999911F, 0.9999999999F, 
 };
 
-static float vwin1024[512] = {
+static const float vwin1024[512] = {
   0.0000036962F, 0.0000332659F, 0.0000924041F, 0.0001811086F, 
   0.0002993761F, 0.0004472021F, 0.0006245811F, 0.0008315063F, 
   0.0010679699F, 0.0013339631F, 0.0016294757F, 0.0019544965F, 
@@ -283,7 +283,7 @@ static float vwin1024[512] = {
   0.9999999836F, 0.9999999957F, 0.9999999994F, 1.0000000000F, 
 };
 
-static float vwin2048[1024] = {
+static const float vwin2048[1024] = {
   0.0000009241F, 0.0000083165F, 0.0000231014F, 0.0000452785F, 
   0.0000748476F, 0.0001118085F, 0.0001561608F, 0.0002079041F, 
   0.0002670379F, 0.0003335617F, 0.0004074748F, 0.0004887765F, 
@@ -542,7 +542,7 @@ static float vwin2048[1024] = {
   0.9999999990F, 0.9999999997F, 1.0000000000F, 1.0000000000F, 
 };
 
-static float vwin4096[2048] = {
+static const float vwin4096[2048] = {
   0.0000002310F, 0.0000020791F, 0.0000057754F, 0.0000113197F, 
   0.0000187121F, 0.0000279526F, 0.0000390412F, 0.0000519777F, 
   0.0000667623F, 0.0000833949F, 0.0001018753F, 0.0001222036F, 
@@ -1057,7 +1057,7 @@ static float vwin4096[2048] = {
   0.9999999999F, 1.0000000000F, 1.0000000000F, 1.0000000000F, 
 };
 
-static float vwin8192[4096] = {
+static const float vwin8192[4096] = {
   0.0000000578F, 0.0000005198F, 0.0000014438F, 0.0000028299F, 
   0.0000046780F, 0.0000069882F, 0.0000097604F, 0.0000129945F, 
   0.0000166908F, 0.0000208490F, 0.0000254692F, 0.0000305515F, 
@@ -2084,7 +2084,7 @@ static float vwin8192[4096] = {
   1.0000000000F, 1.0000000000F, 1.0000000000F, 1.0000000000F, 
 };
 
-static float *vwin[8] = {
+static const float *const vwin[8] = {
   vwin64,
   vwin128,
   vwin256,
@@ -2095,7 +2095,7 @@ static float *vwin[8] = {
   vwin8192,
 };
 
-float *_vorbis_window_get(int n){
+const float *_vorbis_window_get(int n){
   return vwin[n];
 }
 
@@ -2105,8 +2105,8 @@ void _vorbis_apply_window(float *d,int *
   nW=(W?nW:0);
   
   {
-    float *windowLW=vwin[winno[lW]];
-    float *windowNW=vwin[winno[nW]];
+    const float *windowLW=vwin[winno[lW]];
+    const float *windowNW=vwin[winno[nW]];
 
     long n=blocksizes[W];
     long ln=blocksizes[lW];
Index: libvorbis-1.2.0/lib/registry.h
===================================================================
--- libvorbis-1.2.0.orig/lib/registry.h
+++ libvorbis-1.2.0/lib/registry.h
@@ -25,8 +25,8 @@
 #define VI_RESB 3
 #define VI_MAPB 1
 
-extern vorbis_func_floor     *_floor_P[];
-extern vorbis_func_residue   *_residue_P[];
-extern vorbis_func_mapping   *_mapping_P[];
+extern const vorbis_func_floor     *const _floor_P[];
+extern const vorbis_func_residue   *const _residue_P[];
+extern const vorbis_func_mapping   *const _mapping_P[];
 
 #endif
Index: libvorbis-1.2.0/lib/floor0.c
===================================================================
--- libvorbis-1.2.0.orig/lib/floor0.c
+++ libvorbis-1.2.0/lib/floor0.c
@@ -214,7 +214,7 @@ static int floor0_inverse2(vorbis_block 
 }
 
 /* export hooks */
-vorbis_func_floor floor0_exportbundle={
+const vorbis_func_floor floor0_exportbundle={
   NULL,&floor0_unpack,&floor0_look,&floor0_free_info,
   &floor0_free_look,&floor0_inverse1,&floor0_inverse2
 };
Index: libvorbis-1.2.0/lib/floor1.c
===================================================================
--- libvorbis-1.2.0.orig/lib/floor1.c
+++ libvorbis-1.2.0/lib/floor1.c
@@ -1086,7 +1086,7 @@ static int floor1_inverse2(vorbis_block 
 }
 
 /* export hooks */
-vorbis_func_floor floor1_exportbundle={
+const vorbis_func_floor floor1_exportbundle={
   &floor1_pack,&floor1_unpack,&floor1_look,&floor1_free_info,
   &floor1_free_look,&floor1_inverse1,&floor1_inverse2
 };
Index: libvorbis-1.2.0/lib/mapping0.c
===================================================================
--- libvorbis-1.2.0.orig/lib/mapping0.c
+++ libvorbis-1.2.0/lib/mapping0.c
@@ -834,7 +834,7 @@ static int mapping0_inverse(vorbis_block
 }
 
 /* export hooks */
-vorbis_func_mapping mapping0_exportbundle={
+const vorbis_func_mapping mapping0_exportbundle={
   &mapping0_pack,
   &mapping0_unpack,
   &mapping0_free_info,
Index: libvorbis-1.2.0/lib/modes/floor_all.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/floor_all.h
+++ libvorbis-1.2.0/lib/modes/floor_all.h
@@ -19,21 +19,21 @@
 #include "backends.h"
 #include "books/floor/floor_books.h"
 
-static static_codebook *_floor_128x4_books[]={
+static const static_codebook*const _floor_128x4_books[]={
   &_huff_book_line_128x4_class0,
   &_huff_book_line_128x4_0sub0,
   &_huff_book_line_128x4_0sub1,
   &_huff_book_line_128x4_0sub2,
   &_huff_book_line_128x4_0sub3,
 };
-static static_codebook *_floor_256x4_books[]={
+static const static_codebook*const _floor_256x4_books[]={
   &_huff_book_line_256x4_class0,
   &_huff_book_line_256x4_0sub0,
   &_huff_book_line_256x4_0sub1,
   &_huff_book_line_256x4_0sub2,
   &_huff_book_line_256x4_0sub3,
 };
-static static_codebook *_floor_128x7_books[]={
+static const static_codebook*const _floor_128x7_books[]={
   &_huff_book_line_128x7_class0,
   &_huff_book_line_128x7_class1,
   
@@ -44,7 +44,7 @@ static static_codebook *_floor_128x7_boo
   &_huff_book_line_128x7_1sub2,
   &_huff_book_line_128x7_1sub3, 
 };
-static static_codebook *_floor_256x7_books[]={
+static const static_codebook*const _floor_256x7_books[]={
   &_huff_book_line_256x7_class0,
   &_huff_book_line_256x7_class1,
   
@@ -55,7 +55,7 @@ static static_codebook *_floor_256x7_boo
   &_huff_book_line_256x7_1sub2,
   &_huff_book_line_256x7_1sub3, 
 };
-static static_codebook *_floor_128x11_books[]={
+static const static_codebook*const _floor_128x11_books[]={
   &_huff_book_line_128x11_class1,
   &_huff_book_line_128x11_class2,
   &_huff_book_line_128x11_class3,
@@ -70,7 +70,7 @@ static static_codebook *_floor_128x11_bo
   &_huff_book_line_128x11_3sub2,
   &_huff_book_line_128x11_3sub3, 
 };
-static static_codebook *_floor_128x17_books[]={
+static const static_codebook*const _floor_128x17_books[]={
   &_huff_book_line_128x17_class1,
   &_huff_book_line_128x17_class2,
   &_huff_book_line_128x17_class3,
@@ -85,14 +85,14 @@ static static_codebook *_floor_128x17_bo
   &_huff_book_line_128x17_3sub2,
   &_huff_book_line_128x17_3sub3, 
 };
-static static_codebook *_floor_256x4low_books[]={
+static const static_codebook*const _floor_256x4low_books[]={
   &_huff_book_line_256x4low_class0,
   &_huff_book_line_256x4low_0sub0,
   &_huff_book_line_256x4low_0sub1,
   &_huff_book_line_256x4low_0sub2,
   &_huff_book_line_256x4low_0sub3,
 };
-static static_codebook *_floor_1024x27_books[]={
+static const static_codebook*const _floor_1024x27_books[]={
   &_huff_book_line_1024x27_class1,
   &_huff_book_line_1024x27_class2,
   &_huff_book_line_1024x27_class3,
@@ -110,7 +110,7 @@ static static_codebook *_floor_1024x27_b
   &_huff_book_line_1024x27_4sub2,
   &_huff_book_line_1024x27_4sub3,
 };
-static static_codebook *_floor_2048x27_books[]={
+static const static_codebook*const _floor_2048x27_books[]={
   &_huff_book_line_2048x27_class1,
   &_huff_book_line_2048x27_class2,
   &_huff_book_line_2048x27_class3,
@@ -129,7 +129,7 @@ static static_codebook *_floor_2048x27_b
   &_huff_book_line_2048x27_4sub3,
 };
 
-static static_codebook *_floor_512x17_books[]={
+static const static_codebook*const _floor_512x17_books[]={
   &_huff_book_line_512x17_class1,
   &_huff_book_line_512x17_class2,
   &_huff_book_line_512x17_class3,
@@ -145,7 +145,7 @@ static static_codebook *_floor_512x17_bo
   &_huff_book_line_512x17_3sub3, 
 };
 
-static static_codebook **_floor_books[10]={
+static const static_codebook*const *const _floor_books[10]={
   _floor_128x4_books,
   _floor_256x4_books,
   _floor_128x7_books,
@@ -158,7 +158,7 @@ static static_codebook **_floor_books[10
   _floor_512x17_books,
 };
 
-static vorbis_info_floor1 _floor[10]={
+static const vorbis_info_floor1 _floor[10]={
   /* 128 x 4 */
   {
     1,{0},{4},{2},{0},
Index: libvorbis-1.2.0/lib/modes/psych_11.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/psych_11.h
+++ libvorbis-1.2.0/lib/modes/psych_11.h
@@ -15,15 +15,15 @@
 
  ********************************************************************/
 
-static double _psy_lowpass_11[3]={4.5,5.5,30.,};
+static const double _psy_lowpass_11[3]={4.5,5.5,30.,};
 
-static att3 _psy_tone_masteratt_11[3]={
+static const att3 _psy_tone_masteratt_11[3]={
   {{ 30,  25,  12},  0,   0},  /* 0 */
   {{ 30,  25,  12},  0,   0},  /* 0 */
   {{ 20,   0, -14},  0,   0}, /* 0 */
 };
 
-static vp_adjblock _vp_tonemask_adj_11[3]={
+static const vp_adjblock _vp_tonemask_adj_11[3]={
   /* adjust for mode zero */
   /* 63     125     250     500     1     2     4     8    16 */
   {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 2, 0,99,99,99}}, /* 0 */
@@ -32,7 +32,7 @@ static vp_adjblock _vp_tonemask_adj_11[3
 };
 
 
-static noise3 _psy_noisebias_11[3]={
+static const noise3 _psy_noisebias_11[3]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   {{{-10,-10,-10,-10, -5, -5, -5,  0,  4, 10, 10, 12, 12, 12, 99, 99, 99},
     {-15,-15,-15,-15,-10,-10, -5,  0,  0,  4,  4,  5,  5, 10, 99, 99, 99},
@@ -47,5 +47,5 @@ static noise3 _psy_noisebias_11[3]={
     {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24, 99, 99, 99}}},
 };
 
-static double _noise_thresh_11[3]={ .3,.5,.5 };
+static const double _noise_thresh_11[3]={ .3,.5,.5 };
 
Index: libvorbis-1.2.0/lib/modes/psych_16.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/psych_16.h
+++ libvorbis-1.2.0/lib/modes/psych_16.h
@@ -16,7 +16,7 @@
  ********************************************************************/
 
 /* stereo mode by base quality level */
-static adj_stereo _psy_stereo_modes_16[4]={
+static const adj_stereo _psy_stereo_modes_16[4]={
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  */
   {{  4,  4,  4,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3},
    {  6,  5,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4},
@@ -36,16 +36,16 @@ static adj_stereo _psy_stereo_modes_16[4
    { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
 };
 
-static double _psy_lowpass_16[4]={6.5,8,30.,99.};
+static const double _psy_lowpass_16[4]={6.5,8,30.,99.};
 
-static att3 _psy_tone_masteratt_16[4]={
+static const att3 _psy_tone_masteratt_16[4]={
   {{ 30,  25,  12},  0,   0},  /* 0 */
   {{ 25,  22,  12},  0,   0},  /* 0 */
   {{ 20,  12,   0},  0,   0},  /* 0 */
   {{ 15,   0, -14},  0,   0}, /* 0 */
 };
 
-static vp_adjblock _vp_tonemask_adj_16[4]={
+static const vp_adjblock _vp_tonemask_adj_16[4]={
   /* adjust for mode zero */
   /* 63     125     250     500       1     2     4     8    16 */
   {{-20,-20,-20,-20,-20,-16,-10,  0,  0, 0, 0,10, 0, 0, 0, 0, 0}}, /* 0 */
@@ -55,7 +55,7 @@ static vp_adjblock _vp_tonemask_adj_16[4
 };
 
 
-static noise3 _psy_noisebias_16_short[4]={
+static const noise3 _psy_noisebias_16_short[4]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   {{{-15,-15,-15,-15,-15,-10,-10,-5,   4, 10, 10, 10, 10, 12, 12, 14, 20},
     {-15,-15,-15,-15,-15,-10,-10, -5,  0,  0,  4,  5,  5,  6,  8,  8, 15},
@@ -74,7 +74,7 @@ static noise3 _psy_noisebias_16_short[4]
     {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
 };
 
-static noise3 _psy_noisebias_16_impulse[4]={
+static const noise3 _psy_noisebias_16_impulse[4]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   {{{-15,-15,-15,-15,-15,-10,-10,-5,   4, 10, 10, 10, 10, 12, 12, 14, 20},
     {-15,-15,-15,-15,-15,-10,-10, -5,  0,  0,  4,  5,  5,  6,  8,  8, 15},
@@ -93,7 +93,7 @@ static noise3 _psy_noisebias_16_impulse[
     {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
 };
 
-static noise3 _psy_noisebias_16[4]={
+static const noise3 _psy_noisebias_16[4]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   {{{-10,-10,-10,-10, -5, -5, -5,  0,  4,  6,  8,  8, 10, 10, 10, 14, 20},
     {-10,-10,-10,-10,-10, -5, -2, -2,  0,  0,  0,  4,  5,  6,  8,  8, 15},
@@ -112,23 +112,23 @@ static noise3 _psy_noisebias_16[4]={
     {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
 };
 
-static noiseguard _psy_noiseguards_16[4]={
+static const noiseguard _psy_noiseguards_16[4]={
   {10,10,-1},
   {10,10,-1},
   {20,20,-1},
   {20,20,-1},
 };
 
-static double _noise_thresh_16[4]={ .3,.5,.5,.5 };
+static const double _noise_thresh_16[4]={ .3,.5,.5,.5 };
 
-static int _noise_start_16[3]={ 256,256,9999 };
-static int _noise_part_16[4]={ 8,8,8,8 };
+static const int _noise_start_16[3]={ 256,256,9999 };
+static const int _noise_part_16[4]={ 8,8,8,8 };
 
-static int _psy_ath_floater_16[4]={
+static const int _psy_ath_floater_16[4]={
   -100,-100,-100,-105,
 };
 
-static int _psy_ath_abs_16[4]={
+static const int _psy_ath_abs_16[4]={
   -130,-130,-130,-140,
 };
 
Index: libvorbis-1.2.0/lib/modes/psych_44.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/psych_44.h
+++ libvorbis-1.2.0/lib/modes/psych_44.h
@@ -18,7 +18,7 @@
 
 /* preecho trigger settings *****************************************/
 
-static vorbis_info_psy_global _psy_global_44[5]={
+static const vorbis_info_psy_global _psy_global_44[5]={
 
   {8,   /* lines per eighth octave */
    {20.f,14.f,12.f,12.f,12.f,12.f,12.f}, 
@@ -53,7 +53,7 @@ static vorbis_info_psy_global _psy_globa
 };
 
 /* noise compander lookups * low, mid, high quality ****************/
-static compandblock _psy_compand_44[6]={
+static const compandblock _psy_compand_44[6]={
   /* sub-mode Z short */
   {{
     0, 1, 2, 3, 4, 5, 6,  7,     /* 7dB */
@@ -106,7 +106,7 @@ static compandblock _psy_compand_44[6]={
 
 /* tonal masking curve level adjustments *************************/
 
-static vp_adjblock _vp_tonemask_adj_longblock[12]={
+static const vp_adjblock _vp_tonemask_adj_longblock[12]={
 
    /* 63     125     250     500       1       2       4       8      16 */
 
@@ -146,7 +146,7 @@ static vp_adjblock _vp_tonemask_adj_long
    {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2,  0}}, /* 10 */
 };
 
-static vp_adjblock _vp_tonemask_adj_otherblock[12]={
+static const vp_adjblock _vp_tonemask_adj_otherblock[12]={
    /* 63     125     250     500       1       2       4       8      16 */
 
    {{ -3, -8,-13,-15,-10,-10, -9, -9, -9, -9, -9,  1,  1,  1,  1,  1,  1}}, /* -1 */
@@ -186,7 +186,7 @@ static vp_adjblock _vp_tonemask_adj_othe
 };
 
 /* noise bias (transition block) */
-static noise3 _psy_noisebias_trans[12]={
+static const noise3 _psy_noisebias_trans[12]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   /* -1 */
   {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 10, 12, 14, 20},
@@ -269,7 +269,7 @@ static noise3 _psy_noisebias_trans[12]={
 };
 
 /*  noise bias (long block) */
-static noise3 _psy_noisebias_long[12]={
+static const noise3 _psy_noisebias_long[12]={
   /*63     125     250     500      1k       2k      4k      8k     16k*/
   /* -1 */
   {{{-10,-10,-10,-10,-10, -4,  0,  0,  0,  6,  6,  6,  6, 10, 10, 12,  20},
@@ -344,7 +344,7 @@ static noise3 _psy_noisebias_long[12]={
 };
 
 /* noise bias (impulse block) */
-static noise3 _psy_noisebias_impulse[12]={
+static const noise3 _psy_noisebias_impulse[12]={
   /*  63     125     250     500      1k      2k      4k      8k     16k*/
   /* -1 */
   {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 10, 12, 14, 20},
@@ -413,7 +413,7 @@ static noise3 _psy_noisebias_impulse[12]
 };
 
 /* noise bias (padding block) */
-static noise3 _psy_noisebias_padding[12]={
+static const noise3 _psy_noisebias_padding[12]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   
   /* -1 */
@@ -471,24 +471,24 @@ static noise3 _psy_noisebias_padding[12]
 };
 
 
-static noiseguard _psy_noiseguards_44[4]={
+static const noiseguard _psy_noiseguards_44[4]={
   {3,3,15},
   {3,3,15},
   {10,10,100},
   {10,10,100},
 };
 
-static int _psy_tone_suppress[12]={
+static const int _psy_tone_suppress[12]={
   -20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45,
 };
-static int _psy_tone_0dB[12]={
+static const int _psy_tone_0dB[12]={
   90,90,95,95,95,95,105,105,105,105,105,105,
 };
-static int _psy_noise_suppress[12]={
+static const int _psy_noise_suppress[12]={
   -20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45,
 };
 
-static vorbis_info_psy _psy_info_template={
+static const vorbis_info_psy _psy_info_template={
   /* blockflag */
   -1,
   /* ath_adjatt, ath_maxatt */
@@ -506,10 +506,10 @@ static vorbis_info_psy _psy_info_templat
 
 /* ath ****************/
 
-static int _psy_ath_floater[12]={
+static const int _psy_ath_floater[12]={
   -100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120,
 };
-static int _psy_ath_abs[12]={
+static const int _psy_ath_abs[12]={
   -130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150,
 };
 
@@ -522,7 +522,7 @@ static int _psy_ath_abs[12]={
 /* various stereo possibilities */
 
 /* stereo mode by base quality level */
-static adj_stereo _psy_stereo_modes_44[12]={
+static const adj_stereo _psy_stereo_modes_44[12]={
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         -1  */
   {{  4,  4,  4,  4,  4,  4,  4,  3,  2,  2,  1,  0,  0,  0,  0},
    {  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  5,  4,  3},
@@ -615,7 +615,7 @@ static adj_stereo _psy_stereo_modes_44[1
 };
 
 /* tone master attenuation by base quality mode and bitrate tweak */
-static att3 _psy_tone_masteratt_44[12]={
+static const att3 _psy_tone_masteratt_44[12]={
   {{ 35,  21,   9},  0,    0}, /* -1 */
   {{ 30,  20,   8}, -2, 1.25}, /* 0 */
   /*  {{ 25,  14,   4},  0,    0}, *//* 1 */
@@ -633,34 +633,34 @@ static att3 _psy_tone_masteratt_44[12]={
 };
 
 /* lowpass by mode **************/
-static double _psy_lowpass_44[12]={
+static const double _psy_lowpass_44[12]={
   /*  15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999. */
   13.9,15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999.
 };
 
 /* noise normalization **********/
 
-static int _noise_start_short_44[11]={
+static const int _noise_start_short_44[11]={
   /*  16,16,16,16,32,32,9999,9999,9999,9999 */
   32,16,16,16,32,9999,9999,9999,9999,9999,9999
 };
-static int _noise_start_long_44[11]={
+static const int _noise_start_long_44[11]={
   /*  128,128,128,256,512,512,9999,9999,9999,9999 */
   256,128,128,256,512,9999,9999,9999,9999,9999,9999
 };
 
-static int _noise_part_short_44[11]={
+static const int _noise_part_short_44[11]={
     8,8,8,8,8,8,8,8,8,8,8
 };
-static int _noise_part_long_44[11]={
+static const int _noise_part_long_44[11]={
     32,32,32,32,32,32,32,32,32,32,32
 };
 
-static double _noise_thresh_44[11]={
+static const double _noise_thresh_44[11]={
   /*  .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999., */
    .2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999.,
 };
 
-static double _noise_thresh_5only[2]={
+static const double _noise_thresh_5only[2]={
  .5,.5,
 };
Index: libvorbis-1.2.0/lib/modes/psych_8.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/psych_8.h
+++ libvorbis-1.2.0/lib/modes/psych_8.h
@@ -15,13 +15,13 @@
 
  ********************************************************************/
 
-static att3 _psy_tone_masteratt_8[3]={
+static const att3 _psy_tone_masteratt_8[3]={
   {{ 32,  25,  12},  0,   0},  /* 0 */
   {{ 30,  25,  12},  0,   0},  /* 0 */
   {{ 20,   0, -14},  0,   0}, /* 0 */
 };
 
-static vp_adjblock _vp_tonemask_adj_8[3]={
+static const vp_adjblock _vp_tonemask_adj_8[3]={
   /* adjust for mode zero */
   /* 63     125     250     500     1     2     4     8    16 */
   {{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0,10, 0, 0,99,99,99}}, /* 1 */
@@ -30,7 +30,7 @@ static vp_adjblock _vp_tonemask_adj_8[3]
 };
 
 
-static noise3 _psy_noisebias_8[3]={
+static const noise3 _psy_noisebias_8[3]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   {{{-10,-10,-10,-10, -5, -5, -5,  0,  4,  8,  8,  8, 10, 10, 99, 99, 99},
     {-10,-10,-10,-10, -5, -5, -5,  0,  0,  4,  4,  4,  4,  4, 99, 99, 99},
@@ -46,7 +46,7 @@ static noise3 _psy_noisebias_8[3]={
 };
 
 /* stereo mode by base quality level */
-static adj_stereo _psy_stereo_modes_8[3]={
+static const adj_stereo _psy_stereo_modes_8[3]={
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  */
   {{  4,  4,  4,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3},
    {  6,  5,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4},
@@ -62,12 +62,12 @@ static adj_stereo _psy_stereo_modes_8[3]
    { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
 };
 
-static noiseguard _psy_noiseguards_8[2]={
+static const noiseguard _psy_noiseguards_8[2]={
   {10,10,-1},
   {10,10,-1},
 };
 
-static compandblock _psy_compand_8[2]={
+static const compandblock _psy_compand_8[2]={
   {{
      0, 1, 2, 3, 4, 5, 6,  7,     /* 7dB */
      8, 8, 9, 9,10,10,11, 11,     /* 15dB */
@@ -84,19 +84,19 @@ static compandblock _psy_compand_8[2]={
   }},
 };
 
-static double _psy_lowpass_8[3]={3.,4.,4.};
-static int _noise_start_8[2]={
+static const double _psy_lowpass_8[3]={3.,4.,4.};
+static const int _noise_start_8[2]={
   64,64,
 };
-static int _noise_part_8[2]={
+static const int _noise_part_8[2]={
   8,8,
 };
 
-static int _psy_ath_floater_8[3]={
+static const int _psy_ath_floater_8[3]={
   -100,-100,-105,
 };
 
-static int _psy_ath_abs_8[3]={
+static const int _psy_ath_abs_8[3]={
   -130,-130,-140,
 };
 
Index: libvorbis-1.2.0/lib/modes/residue_16.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/residue_16.h
+++ libvorbis-1.2.0/lib/modes/residue_16.h
@@ -1,6 +1,6 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * This FILE IS PART OF THE OggVorbis SOFTWARE 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.       *
@@ -17,7 +17,7 @@
 
 /***** residue backends *********************************************/
 
-static static_bookblock _resbook_16s_0={
+static const static_bookblock _resbook_16s_0={
   {
     {0},
     {0,0,&_16c0_s_p1_0},
@@ -31,7 +31,7 @@ static static_bookblock _resbook_16s_0={
     {&_16c0_s_p9_0,&_16c0_s_p9_1,&_16c0_s_p9_2}
    }
 };
-static static_bookblock _resbook_16s_1={
+static const static_bookblock _resbook_16s_1={
   {
     {0},
     {0,0,&_16c1_s_p1_0},
@@ -45,7 +45,7 @@ static static_bookblock _resbook_16s_1={
     {&_16c1_s_p9_0,&_16c1_s_p9_1,&_16c1_s_p9_2}
    }
 };
-static static_bookblock _resbook_16s_2={
+static const static_bookblock _resbook_16s_2={
   {
     {0},
     {0,0,&_16c2_s_p1_0},
@@ -60,12 +60,12 @@ static static_bookblock _resbook_16s_2={
    }
 };
 
-static vorbis_residue_template _res_16s_0[]={
+static const vorbis_residue_template _res_16s_0[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__16c0_s_single,&_huff_book__16c0_s_single,
    &_resbook_16s_0,&_resbook_16s_0},
 };
-static vorbis_residue_template _res_16s_1[]={
+static const vorbis_residue_template _res_16s_1[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__16c1_s_short,&_huff_book__16c1_s_short,
    &_resbook_16s_1,&_resbook_16s_1},
@@ -74,7 +74,7 @@ static vorbis_residue_template _res_16s_
    &_huff_book__16c1_s_long,&_huff_book__16c1_s_long,
    &_resbook_16s_1,&_resbook_16s_1}
 };
-static vorbis_residue_template _res_16s_2[]={
+static const vorbis_residue_template _res_16s_2[]={
   {2,0,  &_residue_44_high,
    &_huff_book__16c2_s_short,&_huff_book__16c2_s_short,
    &_resbook_16s_2,&_resbook_16s_2},
@@ -84,13 +84,13 @@ static vorbis_residue_template _res_16s_
    &_resbook_16s_2,&_resbook_16s_2}
 };
 
-static vorbis_mapping_template _mapres_template_16_stereo[3]={
+static const vorbis_mapping_template _mapres_template_16_stereo[3]={
   { _map_nominal, _res_16s_0 }, /* 0 */
   { _map_nominal, _res_16s_1 }, /* 1 */
   { _map_nominal, _res_16s_2 }, /* 2 */
 };
 
-static static_bookblock _resbook_16u_0={
+static const static_bookblock _resbook_16u_0={
   {
     {0},
     {0,0,&_16u0__p1_0},
@@ -102,7 +102,7 @@ static static_bookblock _resbook_16u_0={
     {&_16u0__p7_0,&_16u0__p7_1,&_16u0__p7_2}
    }
 };
-static static_bookblock _resbook_16u_1={
+static const static_bookblock _resbook_16u_1={
   {
     {0},
     {0,0,&_16u1__p1_0},
@@ -116,7 +116,7 @@ static static_bookblock _resbook_16u_1={
     {&_16u1__p9_0,&_16u1__p9_1,&_16u1__p9_2}
    }
 };
-static static_bookblock _resbook_16u_2={
+static const static_bookblock _resbook_16u_2={
   {
     {0},
     {0,0,&_16u2_p1_0},
@@ -131,12 +131,12 @@ static static_bookblock _resbook_16u_2={
    }
 };
 
-static vorbis_residue_template _res_16u_0[]={
+static const vorbis_residue_template _res_16u_0[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__16u0__single,&_huff_book__16u0__single,
    &_resbook_16u_0,&_resbook_16u_0},
 };
-static vorbis_residue_template _res_16u_1[]={
+static const vorbis_residue_template _res_16u_1[]={
   {1,0,  &_residue_44_mid_un,
    &_huff_book__16u1__short,&_huff_book__16u1__short,
    &_resbook_16u_1,&_resbook_16u_1},
@@ -145,7 +145,7 @@ static vorbis_residue_template _res_16u_
    &_huff_book__16u1__long,&_huff_book__16u1__long,
    &_resbook_16u_1,&_resbook_16u_1}
 };
-static vorbis_residue_template _res_16u_2[]={
+static const vorbis_residue_template _res_16u_2[]={
   {1,0,  &_residue_44_hi_un,
    &_huff_book__16u2__short,&_huff_book__16u2__short,
    &_resbook_16u_2,&_resbook_16u_2},
@@ -156,7 +156,7 @@ static vorbis_residue_template _res_16u_
 };
 
 
-static vorbis_mapping_template _mapres_template_16_uncoupled[3]={
+static const vorbis_mapping_template _mapres_template_16_uncoupled[3]={
   { _map_nominal_u, _res_16u_0 }, /* 0 */
   { _map_nominal_u, _res_16u_1 }, /* 1 */
   { _map_nominal_u, _res_16u_2 }, /* 2 */
Index: libvorbis-1.2.0/lib/modes/residue_44.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/residue_44.h
+++ libvorbis-1.2.0/lib/modes/residue_44.h
@@ -21,7 +21,7 @@
 
 /***** residue backends *********************************************/
 
-static vorbis_info_residue0 _residue_44_low={
+static const vorbis_info_residue0 _residue_44_low={
   0,-1, -1, 9,-1,
   /*  0     1     2     3     4     5     6     7  */
   {0},
@@ -30,7 +30,7 @@ static vorbis_info_residue0 _residue_44_
   {  .5,   .5,   .5,  999., 4.5,  8.5,  16.5, 32.5},
 };
 
-static vorbis_info_residue0 _residue_44_mid={
+static const vorbis_info_residue0 _residue_44_mid={
   0,-1, -1, 10,-1,
   /*  0     1     2     3     4     5     6     7     8  */
   {0},
@@ -39,7 +39,7 @@ static vorbis_info_residue0 _residue_44_
   {  .5,   .5, 999.,   .5,  999., 4.5,  8.5,  16.5, 32.5},
 };
 
-static vorbis_info_residue0 _residue_44_high={
+static const vorbis_info_residue0 _residue_44_high={
   0,-1, -1, 10,-1,
   /*  0     1     2     3     4     5     6     7     8  */
   {0},
@@ -48,7 +48,7 @@ static vorbis_info_residue0 _residue_44_
   {  .5,  1.5,  2.5,  3.5,  4.5,  8.5, 16.5, 71.5,157.5},
 };
 
-static static_bookblock _resbook_44s_n1={
+static const static_bookblock _resbook_44s_n1={
   {
     {0},{0,0,&_44cn1_s_p1_0},{0,0,&_44cn1_s_p2_0},
     {0,0,&_44cn1_s_p3_0},{0,0,&_44cn1_s_p4_0},{0,0,&_44cn1_s_p5_0},
@@ -56,7 +56,7 @@ static static_bookblock _resbook_44s_n1=
     {&_44cn1_s_p8_0,&_44cn1_s_p8_1,&_44cn1_s_p8_2}
    }
 };
-static static_bookblock _resbook_44sm_n1={
+static const static_bookblock _resbook_44sm_n1={
   {
     {0},{0,0,&_44cn1_sm_p1_0},{0,0,&_44cn1_sm_p2_0},
     {0,0,&_44cn1_sm_p3_0},{0,0,&_44cn1_sm_p4_0},{0,0,&_44cn1_sm_p5_0},
@@ -65,7 +65,7 @@ static static_bookblock _resbook_44sm_n1
    }
 };
 
-static static_bookblock _resbook_44s_0={
+static const static_bookblock _resbook_44s_0={
   {
     {0},{0,0,&_44c0_s_p1_0},{0,0,&_44c0_s_p2_0},
     {0,0,&_44c0_s_p3_0},{0,0,&_44c0_s_p4_0},{0,0,&_44c0_s_p5_0},
@@ -73,7 +73,7 @@ static static_bookblock _resbook_44s_0={
     {&_44c0_s_p8_0,&_44c0_s_p8_1,&_44c0_s_p8_2}
    }
 };
-static static_bookblock _resbook_44sm_0={
+static const static_bookblock _resbook_44sm_0={
   {
     {0},{0,0,&_44c0_sm_p1_0},{0,0,&_44c0_sm_p2_0},
     {0,0,&_44c0_sm_p3_0},{0,0,&_44c0_sm_p4_0},{0,0,&_44c0_sm_p5_0},
@@ -82,7 +82,7 @@ static static_bookblock _resbook_44sm_0=
    }
 };
 
-static static_bookblock _resbook_44s_1={
+static const static_bookblock _resbook_44s_1={
   {
     {0},{0,0,&_44c1_s_p1_0},{0,0,&_44c1_s_p2_0},
     {0,0,&_44c1_s_p3_0},{0,0,&_44c1_s_p4_0},{0,0,&_44c1_s_p5_0},
@@ -90,7 +90,7 @@ static static_bookblock _resbook_44s_1={
     {&_44c1_s_p8_0,&_44c1_s_p8_1,&_44c1_s_p8_2}
    }
 };
-static static_bookblock _resbook_44sm_1={
+static const static_bookblock _resbook_44sm_1={
   {
     {0},{0,0,&_44c1_sm_p1_0},{0,0,&_44c1_sm_p2_0},
     {0,0,&_44c1_sm_p3_0},{0,0,&_44c1_sm_p4_0},{0,0,&_44c1_sm_p5_0},
@@ -99,7 +99,7 @@ static static_bookblock _resbook_44sm_1=
    }
 };
 
-static static_bookblock _resbook_44s_2={
+static const static_bookblock _resbook_44s_2={
   {
     {0},{0,0,&_44c2_s_p1_0},{0,0,&_44c2_s_p2_0},{0,0,&_44c2_s_p3_0},
     {0,0,&_44c2_s_p4_0},{0,0,&_44c2_s_p5_0},{0,0,&_44c2_s_p6_0},
@@ -107,7 +107,7 @@ static static_bookblock _resbook_44s_2={
     {&_44c2_s_p9_0,&_44c2_s_p9_1,&_44c2_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_3={
+static const static_bookblock _resbook_44s_3={
   {
     {0},{0,0,&_44c3_s_p1_0},{0,0,&_44c3_s_p2_0},{0,0,&_44c3_s_p3_0},
     {0,0,&_44c3_s_p4_0},{0,0,&_44c3_s_p5_0},{0,0,&_44c3_s_p6_0},
@@ -115,7 +115,7 @@ static static_bookblock _resbook_44s_3={
     {&_44c3_s_p9_0,&_44c3_s_p9_1,&_44c3_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_4={
+static const static_bookblock _resbook_44s_4={
   {
     {0},{0,0,&_44c4_s_p1_0},{0,0,&_44c4_s_p2_0},{0,0,&_44c4_s_p3_0},
     {0,0,&_44c4_s_p4_0},{0,0,&_44c4_s_p5_0},{0,0,&_44c4_s_p6_0},
@@ -123,7 +123,7 @@ static static_bookblock _resbook_44s_4={
     {&_44c4_s_p9_0,&_44c4_s_p9_1,&_44c4_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_5={
+static const static_bookblock _resbook_44s_5={
   {
     {0},{0,0,&_44c5_s_p1_0},{0,0,&_44c5_s_p2_0},{0,0,&_44c5_s_p3_0},
     {0,0,&_44c5_s_p4_0},{0,0,&_44c5_s_p5_0},{0,0,&_44c5_s_p6_0},
@@ -131,7 +131,7 @@ static static_bookblock _resbook_44s_5={
     {&_44c5_s_p9_0,&_44c5_s_p9_1,&_44c5_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_6={
+static const static_bookblock _resbook_44s_6={
   {
     {0},{0,0,&_44c6_s_p1_0},{0,0,&_44c6_s_p2_0},{0,0,&_44c6_s_p3_0},
     {0,0,&_44c6_s_p4_0},
@@ -142,7 +142,7 @@ static static_bookblock _resbook_44s_6={
     {&_44c6_s_p9_0,&_44c6_s_p9_1,&_44c6_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_7={
+static const static_bookblock _resbook_44s_7={
   {
     {0},{0,0,&_44c7_s_p1_0},{0,0,&_44c7_s_p2_0},{0,0,&_44c7_s_p3_0},
     {0,0,&_44c7_s_p4_0},
@@ -153,7 +153,7 @@ static static_bookblock _resbook_44s_7={
     {&_44c7_s_p9_0,&_44c7_s_p9_1,&_44c7_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_8={
+static const static_bookblock _resbook_44s_8={
   {
     {0},{0,0,&_44c8_s_p1_0},{0,0,&_44c8_s_p2_0},{0,0,&_44c8_s_p3_0},
     {0,0,&_44c8_s_p4_0},
@@ -164,7 +164,7 @@ static static_bookblock _resbook_44s_8={
     {&_44c8_s_p9_0,&_44c8_s_p9_1,&_44c8_s_p9_2}
    }
 };
-static static_bookblock _resbook_44s_9={
+static const static_bookblock _resbook_44s_9={
   {
     {0},{0,0,&_44c9_s_p1_0},{0,0,&_44c9_s_p2_0},{0,0,&_44c9_s_p3_0},
     {0,0,&_44c9_s_p4_0},
@@ -176,7 +176,7 @@ static static_bookblock _resbook_44s_9={
    }
 };
 
-static vorbis_residue_template _res_44s_n1[]={
+static const vorbis_residue_template _res_44s_n1[]={
   {2,0,  &_residue_44_low,
    &_huff_book__44cn1_s_short,&_huff_book__44cn1_sm_short,
    &_resbook_44s_n1,&_resbook_44sm_n1},
@@ -185,7 +185,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44cn1_s_long,&_huff_book__44cn1_sm_long,
    &_resbook_44s_n1,&_resbook_44sm_n1}
 };
-static vorbis_residue_template _res_44s_0[]={
+static const vorbis_residue_template _res_44s_0[]={
   {2,0,  &_residue_44_low,
    &_huff_book__44c0_s_short,&_huff_book__44c0_sm_short,
    &_resbook_44s_0,&_resbook_44sm_0},
@@ -194,7 +194,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c0_s_long,&_huff_book__44c0_sm_long,
    &_resbook_44s_0,&_resbook_44sm_0}
 };
-static vorbis_residue_template _res_44s_1[]={
+static const vorbis_residue_template _res_44s_1[]={
   {2,0,  &_residue_44_low,
    &_huff_book__44c1_s_short,&_huff_book__44c1_sm_short,
    &_resbook_44s_1,&_resbook_44sm_1},
@@ -204,7 +204,7 @@ static vorbis_residue_template _res_44s_
    &_resbook_44s_1,&_resbook_44sm_1}
 };
 
-static vorbis_residue_template _res_44s_2[]={
+static const vorbis_residue_template _res_44s_2[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__44c2_s_short,&_huff_book__44c2_s_short,
    &_resbook_44s_2,&_resbook_44s_2},
@@ -213,7 +213,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c2_s_long,&_huff_book__44c2_s_long,
    &_resbook_44s_2,&_resbook_44s_2}
 };
-static vorbis_residue_template _res_44s_3[]={
+static const vorbis_residue_template _res_44s_3[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__44c3_s_short,&_huff_book__44c3_s_short,
    &_resbook_44s_3,&_resbook_44s_3},
@@ -222,7 +222,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c3_s_long,&_huff_book__44c3_s_long,
    &_resbook_44s_3,&_resbook_44s_3}
 };
-static vorbis_residue_template _res_44s_4[]={
+static const vorbis_residue_template _res_44s_4[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__44c4_s_short,&_huff_book__44c4_s_short,
    &_resbook_44s_4,&_resbook_44s_4},
@@ -231,7 +231,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c4_s_long,&_huff_book__44c4_s_long,
    &_resbook_44s_4,&_resbook_44s_4}
 };
-static vorbis_residue_template _res_44s_5[]={
+static const vorbis_residue_template _res_44s_5[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__44c5_s_short,&_huff_book__44c5_s_short,
    &_resbook_44s_5,&_resbook_44s_5},
@@ -240,7 +240,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c5_s_long,&_huff_book__44c5_s_long,
    &_resbook_44s_5,&_resbook_44s_5}
 };
-static vorbis_residue_template _res_44s_6[]={
+static const vorbis_residue_template _res_44s_6[]={
   {2,0,  &_residue_44_high,
    &_huff_book__44c6_s_short,&_huff_book__44c6_s_short,
    &_resbook_44s_6,&_resbook_44s_6},
@@ -249,7 +249,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c6_s_long,&_huff_book__44c6_s_long,
    &_resbook_44s_6,&_resbook_44s_6}
 };
-static vorbis_residue_template _res_44s_7[]={
+static const vorbis_residue_template _res_44s_7[]={
   {2,0,  &_residue_44_high,
    &_huff_book__44c7_s_short,&_huff_book__44c7_s_short,
    &_resbook_44s_7,&_resbook_44s_7},
@@ -258,7 +258,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c7_s_long,&_huff_book__44c7_s_long,
    &_resbook_44s_7,&_resbook_44s_7}
 };
-static vorbis_residue_template _res_44s_8[]={
+static const vorbis_residue_template _res_44s_8[]={
   {2,0,  &_residue_44_high,
    &_huff_book__44c8_s_short,&_huff_book__44c8_s_short,
    &_resbook_44s_8,&_resbook_44s_8},
@@ -267,7 +267,7 @@ static vorbis_residue_template _res_44s_
    &_huff_book__44c8_s_long,&_huff_book__44c8_s_long,
    &_resbook_44s_8,&_resbook_44s_8}
 };
-static vorbis_residue_template _res_44s_9[]={
+static const vorbis_residue_template _res_44s_9[]={
   {2,0,  &_residue_44_high,
    &_huff_book__44c9_s_short,&_huff_book__44c9_s_short,
    &_resbook_44s_9,&_resbook_44s_9},
@@ -277,7 +277,7 @@ static vorbis_residue_template _res_44s_
    &_resbook_44s_9,&_resbook_44s_9}
 };
 
-static vorbis_mapping_template _mapres_template_44_stereo[]={
+static const vorbis_mapping_template _mapres_template_44_stereo[]={
   { _map_nominal, _res_44s_n1 }, /* -1 */
   { _map_nominal, _res_44s_0 }, /* 0 */
   { _map_nominal, _res_44s_1 }, /* 1 */
Index: libvorbis-1.2.0/lib/modes/residue_44u.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/residue_44u.h
+++ libvorbis-1.2.0/lib/modes/residue_44u.h
@@ -22,7 +22,7 @@
 /***** residue backends *********************************************/
 
 
-static vorbis_info_residue0 _residue_44_low_un={
+static const vorbis_info_residue0 _residue_44_low_un={
   0,-1, -1, 8,-1,
   {0},
   {-1},
@@ -30,7 +30,7 @@ static vorbis_info_residue0 _residue_44_
   {  -1,   25,   -1,   45,   -1,   -1,   -1}
 };
 
-static vorbis_info_residue0 _residue_44_mid_un={
+static const vorbis_info_residue0 _residue_44_mid_un={
   0,-1, -1, 10,-1,
   /*  0     1     2     3     4     5     6     7     8     9 */
   {0},
@@ -39,7 +39,7 @@ static vorbis_info_residue0 _residue_44_
   {  -1,   30,   -1,   50,   -1,   80,   -1,   -1,   -1}
 };
 
-static vorbis_info_residue0 _residue_44_hi_un={
+static const vorbis_info_residue0 _residue_44_hi_un={
   0,-1, -1, 10,-1,
   /*  0     1     2     3     4     5     6     7     8     9 */
   {0},
@@ -51,12 +51,12 @@ static vorbis_info_residue0 _residue_44_
 /* mapping conventions:
    only one submap (this would change for efficient 5.1 support for example)*/
 /* Four psychoacoustic profiles are used, one for each blocktype */
-static vorbis_info_mapping0 _map_nominal_u[2]={
+static const vorbis_info_mapping0 _map_nominal_u[2]={
   {1, {0,0}, {0}, {0}, 0,{0},{0}},
   {1, {0,0}, {1}, {1}, 0,{0},{0}}
 };
 
-static static_bookblock _resbook_44u_n1={
+static const static_bookblock _resbook_44u_n1={
   {
     {0},
     {0,0,&_44un1__p1_0},
@@ -68,7 +68,7 @@ static static_bookblock _resbook_44u_n1=
     {&_44un1__p7_0,&_44un1__p7_1,&_44un1__p7_2}
    }
 };
-static static_bookblock _resbook_44u_0={
+static const static_bookblock _resbook_44u_0={
   {
     {0},
     {0,0,&_44u0__p1_0},
@@ -80,7 +80,7 @@ static static_bookblock _resbook_44u_0={
     {&_44u0__p7_0,&_44u0__p7_1,&_44u0__p7_2}
    }
 };
-static static_bookblock _resbook_44u_1={
+static const static_bookblock _resbook_44u_1={
   {
     {0},
     {0,0,&_44u1__p1_0},
@@ -92,7 +92,7 @@ static static_bookblock _resbook_44u_1={
     {&_44u1__p7_0,&_44u1__p7_1,&_44u1__p7_2}
    }
 };
-static static_bookblock _resbook_44u_2={
+static const static_bookblock _resbook_44u_2={
   {
     {0},
     {0,0,&_44u2__p1_0},
@@ -104,7 +104,7 @@ static static_bookblock _resbook_44u_2={
     {&_44u2__p7_0,&_44u2__p7_1,&_44u2__p7_2}
    }
 };
-static static_bookblock _resbook_44u_3={
+static const static_bookblock _resbook_44u_3={
   {
     {0},
     {0,0,&_44u3__p1_0},
@@ -116,7 +116,7 @@ static static_bookblock _resbook_44u_3={
     {&_44u3__p7_0,&_44u3__p7_1,&_44u3__p7_2}
    }
 };
-static static_bookblock _resbook_44u_4={
+static const static_bookblock _resbook_44u_4={
   {
     {0},
     {0,0,&_44u4__p1_0},
@@ -128,7 +128,7 @@ static static_bookblock _resbook_44u_4={
     {&_44u4__p7_0,&_44u4__p7_1,&_44u4__p7_2}
    }
 };
-static static_bookblock _resbook_44u_5={
+static const static_bookblock _resbook_44u_5={
   {
     {0},
     {0,0,&_44u5__p1_0},
@@ -142,7 +142,7 @@ static static_bookblock _resbook_44u_5={
     {&_44u5__p9_0,&_44u5__p9_1,&_44u5__p9_2}
    }
 };
-static static_bookblock _resbook_44u_6={
+static const static_bookblock _resbook_44u_6={
   {
     {0},
     {0,0,&_44u6__p1_0},
@@ -156,7 +156,7 @@ static static_bookblock _resbook_44u_6={
     {&_44u6__p9_0,&_44u6__p9_1,&_44u6__p9_2}
    }
 };
-static static_bookblock _resbook_44u_7={
+static const static_bookblock _resbook_44u_7={
   {
     {0},
     {0,0,&_44u7__p1_0},
@@ -170,7 +170,7 @@ static static_bookblock _resbook_44u_7={
     {&_44u7__p9_0,&_44u7__p9_1,&_44u7__p9_2}
    }
 };
-static static_bookblock _resbook_44u_8={
+static const static_bookblock _resbook_44u_8={
   {
     {0},
     {0,0,&_44u8_p1_0},
@@ -184,7 +184,7 @@ static static_bookblock _resbook_44u_8={
     {&_44u8_p9_0,&_44u8_p9_1,&_44u8_p9_2}
    }
 };
-static static_bookblock _resbook_44u_9={
+static const static_bookblock _resbook_44u_9={
   {
     {0},
     {0,0,&_44u9_p1_0},
@@ -199,7 +199,7 @@ static static_bookblock _resbook_44u_9={
    }
 };
 
-static vorbis_residue_template _res_44u_n1[]={
+static const vorbis_residue_template _res_44u_n1[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44un1__short,&_huff_book__44un1__short,
    &_resbook_44u_n1,&_resbook_44u_n1},
@@ -208,7 +208,7 @@ static vorbis_residue_template _res_44u_
    &_huff_book__44un1__long,&_huff_book__44un1__long,
    &_resbook_44u_n1,&_resbook_44u_n1}
 };
-static vorbis_residue_template _res_44u_0[]={
+static const vorbis_residue_template _res_44u_0[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44u0__short,&_huff_book__44u0__short,
    &_resbook_44u_0,&_resbook_44u_0},
@@ -217,7 +217,7 @@ static vorbis_residue_template _res_44u_
    &_huff_book__44u0__long,&_huff_book__44u0__long,
    &_resbook_44u_0,&_resbook_44u_0}
 };
-static vorbis_residue_template _res_44u_1[]={
+static const vorbis_residue_template _res_44u_1[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44u1__short,&_huff_book__44u1__short,
    &_resbook_44u_1,&_resbook_44u_1},
@@ -226,7 +226,7 @@ static vorbis_residue_template _res_44u_
    &_huff_book__44u1__long,&_huff_book__44u1__long,
    &_resbook_44u_1,&_resbook_44u_1}
 };
-static vorbis_residue_template _res_44u_2[]={
+static const vorbis_residue_template _res_44u_2[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44u2__short,&_huff_book__44u2__short,
    &_resbook_44u_2,&_resbook_44u_2},
@@ -235,7 +235,7 @@ static vorbis_residue_template _res_44u_
    &_huff_book__44u2__long,&_huff_book__44u2__long,
    &_resbook_44u_2,&_resbook_44u_2}
 };
-static vorbis_residue_template _res_44u_3[]={
+static const vorbis_residue_template _res_44u_3[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44u3__short,&_huff_book__44u3__short,
    &_resbook_44u_3,&_resbook_44u_3},
@@ -244,7 +244,7 @@ static vorbis_residue_template _res_44u_
    &_huff_book__44u3__long,&_huff_book__44u3__long,
    &_resbook_44u_3,&_resbook_44u_3}
 };
-static vorbis_residue_template _res_44u_4[]={
+static const vorbis_residue_template _res_44u_4[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44u4__short,&_huff_book__44u4__short,
    &_resbook_44u_4,&_resbook_44u_4},
@@ -254,7 +254,7 @@ static vorbis_residue_template _res_44u_
    &_resbook_44u_4,&_resbook_44u_4}
 };
 
-static vorbis_residue_template _res_44u_5[]={
+static const vorbis_residue_template _res_44u_5[]={
   {1,0,  &_residue_44_mid_un,
    &_huff_book__44u5__short,&_huff_book__44u5__short,
    &_resbook_44u_5,&_resbook_44u_5},
@@ -264,7 +264,7 @@ static vorbis_residue_template _res_44u_
    &_resbook_44u_5,&_resbook_44u_5}
 };
 
-static vorbis_residue_template _res_44u_6[]={
+static const vorbis_residue_template _res_44u_6[]={
   {1,0,  &_residue_44_mid_un,
    &_huff_book__44u6__short,&_huff_book__44u6__short,
    &_resbook_44u_6,&_resbook_44u_6},
@@ -274,7 +274,7 @@ static vorbis_residue_template _res_44u_
    &_resbook_44u_6,&_resbook_44u_6}
 };
 
-static vorbis_residue_template _res_44u_7[]={
+static const vorbis_residue_template _res_44u_7[]={
   {1,0,  &_residue_44_mid_un,
    &_huff_book__44u7__short,&_huff_book__44u7__short,
    &_resbook_44u_7,&_resbook_44u_7},
@@ -284,7 +284,7 @@ static vorbis_residue_template _res_44u_
    &_resbook_44u_7,&_resbook_44u_7}
 };
 
-static vorbis_residue_template _res_44u_8[]={
+static const vorbis_residue_template _res_44u_8[]={
   {1,0,  &_residue_44_hi_un,
    &_huff_book__44u8__short,&_huff_book__44u8__short,
    &_resbook_44u_8,&_resbook_44u_8},
@@ -293,7 +293,7 @@ static vorbis_residue_template _res_44u_
    &_huff_book__44u8__long,&_huff_book__44u8__long,
    &_resbook_44u_8,&_resbook_44u_8}
 };
-static vorbis_residue_template _res_44u_9[]={
+static const vorbis_residue_template _res_44u_9[]={
   {1,0,  &_residue_44_hi_un,
    &_huff_book__44u9__short,&_huff_book__44u9__short,
    &_resbook_44u_9,&_resbook_44u_9},
@@ -303,7 +303,7 @@ static vorbis_residue_template _res_44u_
    &_resbook_44u_9,&_resbook_44u_9}
 };
 
-static vorbis_mapping_template _mapres_template_44_uncoupled[]={
+static const vorbis_mapping_template _mapres_template_44_uncoupled[]={
   { _map_nominal_u, _res_44u_n1 }, /* -1 */
   { _map_nominal_u, _res_44u_0 }, /* 0 */
   { _map_nominal_u, _res_44u_1 }, /* 1 */
Index: libvorbis-1.2.0/lib/modes/residue_8.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/residue_8.h
+++ libvorbis-1.2.0/lib/modes/residue_8.h
@@ -20,7 +20,7 @@
 
 /***** residue backends *********************************************/
 
-static static_bookblock _resbook_8s_0={
+static const static_bookblock _resbook_8s_0={
   {
     {0},
     {0,0,&_8c0_s_p1_0},
@@ -34,7 +34,7 @@ static static_bookblock _resbook_8s_0={
     {&_8c0_s_p9_0,&_8c0_s_p9_1,&_8c0_s_p9_2}
    }
 };
-static static_bookblock _resbook_8s_1={
+static const static_bookblock _resbook_8s_1={
   {
     {0},
     {0,0,&_8c1_s_p1_0},
@@ -49,23 +49,23 @@ static static_bookblock _resbook_8s_1={
    }
 };
 
-static vorbis_residue_template _res_8s_0[]={
+static const vorbis_residue_template _res_8s_0[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__8c0_s_single,&_huff_book__8c0_s_single,
    &_resbook_8s_0,&_resbook_8s_0},
 };
-static vorbis_residue_template _res_8s_1[]={
+static const vorbis_residue_template _res_8s_1[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__8c1_s_single,&_huff_book__8c1_s_single,
    &_resbook_8s_1,&_resbook_8s_1},
 };
 
-static vorbis_mapping_template _mapres_template_8_stereo[2]={
+static const vorbis_mapping_template _mapres_template_8_stereo[2]={
   { _map_nominal, _res_8s_0 }, /* 0 */
   { _map_nominal, _res_8s_1 }, /* 1 */
 };
 
-static static_bookblock _resbook_8u_0={
+static const static_bookblock _resbook_8u_0={
   {
     {0},
     {0,0,&_8u0__p1_0},
@@ -77,7 +77,7 @@ static static_bookblock _resbook_8u_0={
     {&_8u0__p7_0,&_8u0__p7_1,&_8u0__p7_2}
    }
 };
-static static_bookblock _resbook_8u_1={
+static const static_bookblock _resbook_8u_1={
   {
     {0},
     {0,0,&_8u1__p1_0},
@@ -92,18 +92,18 @@ static static_bookblock _resbook_8u_1={
    }
 };
 
-static vorbis_residue_template _res_8u_0[]={
+static const vorbis_residue_template _res_8u_0[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__8u0__single,&_huff_book__8u0__single,
    &_resbook_8u_0,&_resbook_8u_0},
 };
-static vorbis_residue_template _res_8u_1[]={
+static const vorbis_residue_template _res_8u_1[]={
   {1,0,  &_residue_44_mid_un,
    &_huff_book__8u1__single,&_huff_book__8u1__single,
    &_resbook_8u_1,&_resbook_8u_1},
 };
 
-static vorbis_mapping_template _mapres_template_8_uncoupled[2]={
+static const vorbis_mapping_template _mapres_template_8_uncoupled[2]={
   { _map_nominal_u, _res_8u_0 }, /* 0 */
   { _map_nominal_u, _res_8u_1 }, /* 1 */
 };
Index: libvorbis-1.2.0/lib/modes/setup_11.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_11.h
+++ libvorbis-1.2.0/lib/modes/setup_11.h
@@ -17,27 +17,27 @@
 
 #include "psych_11.h"
 
-static int blocksize_11[2]={
+static const int blocksize_11[2]={
   512,512
 };
 
-static int _floor_mapping_11[2]={
+static const int _floor_mapping_11[2]={
   6,6,
 };
 
-static double rate_mapping_11[3]={
+static const double rate_mapping_11[3]={
   8000.,13000.,44000.,
 };
 
-static double rate_mapping_11_uncoupled[3]={
+static const double rate_mapping_11_uncoupled[3]={
   12000.,20000.,50000.,
 };
 
-static double quality_mapping_11[3]={
+static const double quality_mapping_11[3]={
   -.1,.0,1.
 };
 
-ve_setup_data_template ve_setup_11_stereo={
+static const ve_setup_data_template ve_setup_11_stereo={
   2,
   rate_mapping_11,
   quality_mapping_11,
@@ -88,7 +88,7 @@ ve_setup_data_template ve_setup_11_stere
   _mapres_template_8_stereo
 };
 
-ve_setup_data_template ve_setup_11_uncoupled={
+static const ve_setup_data_template ve_setup_11_uncoupled={
   2,
   rate_mapping_11_uncoupled,
   quality_mapping_11,
Index: libvorbis-1.2.0/lib/modes/setup_16.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_16.h
+++ libvorbis-1.2.0/lib/modes/setup_16.h
@@ -18,35 +18,35 @@
 #include "psych_16.h"
 #include "residue_16.h"
 
-static int blocksize_16_short[3]={
+static const int blocksize_16_short[3]={
   1024,512,512
 };
-static int blocksize_16_long[3]={
+static const int blocksize_16_long[3]={
   1024,1024,1024
 };
 
-static int _floor_mapping_16_short[3]={
+static const int _floor_mapping_16_short[3]={
   9,3,3
 };
-static int _floor_mapping_16[3]={
+static const int _floor_mapping_16[3]={
   9,9,9
 };
 
-static double rate_mapping_16[4]={
+static const double rate_mapping_16[4]={
   12000.,20000.,44000.,86000.
 };
 
-static double rate_mapping_16_uncoupled[4]={
+static const double rate_mapping_16_uncoupled[4]={
   16000.,28000.,64000.,100000.
 };
 
-static double _global_mapping_16[4]={ 1., 2., 3., 4. };
+static const double _global_mapping_16[4]={ 1., 2., 3., 4. };
 
-static double quality_mapping_16[4]={ -.1,.05,.5,1. };
+static const double quality_mapping_16[4]={ -.1,.05,.5,1. };
 
-static double _psy_compand_16_mapping[4]={ 0., .8, 1., 1.};
+static const double _psy_compand_16_mapping[4]={ 0., .8, 1., 1.};
 
-ve_setup_data_template ve_setup_16_stereo={
+static const ve_setup_data_template ve_setup_16_stereo={
   3,
   rate_mapping_16,
   quality_mapping_16,
@@ -97,7 +97,7 @@ ve_setup_data_template ve_setup_16_stere
   _mapres_template_16_stereo
 };
 
-ve_setup_data_template ve_setup_16_uncoupled={
+static const ve_setup_data_template ve_setup_16_uncoupled={
   3,
   rate_mapping_16_uncoupled,
   quality_mapping_16,
Index: libvorbis-1.2.0/lib/modes/setup_22.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_22.h
+++ libvorbis-1.2.0/lib/modes/setup_22.h
@@ -15,17 +15,17 @@
 
  ********************************************************************/
 
-static double rate_mapping_22[4]={
+static const double rate_mapping_22[4]={
   15000.,20000.,44000.,86000.
 };
 
-static double rate_mapping_22_uncoupled[4]={
+static const double rate_mapping_22_uncoupled[4]={
   16000.,28000.,50000.,90000.
 };
 
-static double _psy_lowpass_22[4]={9.5,11.,30.,99.};
+static const double _psy_lowpass_22[4]={9.5,11.,30.,99.};
 
-ve_setup_data_template ve_setup_22_stereo={
+static const ve_setup_data_template ve_setup_22_stereo={
   3,
   rate_mapping_22,
   quality_mapping_16,
@@ -76,7 +76,7 @@ ve_setup_data_template ve_setup_22_stere
   _mapres_template_16_stereo
 };
 
-ve_setup_data_template ve_setup_22_uncoupled={
+static const ve_setup_data_template ve_setup_22_uncoupled={
   3,
   rate_mapping_22_uncoupled,
   quality_mapping_16,
Index: libvorbis-1.2.0/lib/modes/setup_32.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_32.h
+++ libvorbis-1.2.0/lib/modes/setup_32.h
@@ -15,21 +15,21 @@
 
  ********************************************************************/
 
-static double rate_mapping_32[12]={
+static const double rate_mapping_32[12]={
   18000.,28000.,35000.,45000.,56000.,60000.,
   75000.,90000.,100000.,115000.,150000.,190000.,
 };
 
-static double rate_mapping_32_un[12]={
+static const double rate_mapping_32_un[12]={
   30000.,42000.,52000.,64000.,72000.,78000.,
   86000.,92000.,110000.,120000.,140000.,190000.,
 };
 
-static double _psy_lowpass_32[12]={
+static const double _psy_lowpass_32[12]={
   12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99.
 };
 
-ve_setup_data_template ve_setup_32_stereo={
+static const ve_setup_data_template ve_setup_32_stereo={
   11,
   rate_mapping_32,
   quality_mapping_44,
@@ -80,7 +80,7 @@ ve_setup_data_template ve_setup_32_stere
   _mapres_template_44_stereo
 };
 
-ve_setup_data_template ve_setup_32_uncoupled={
+static const ve_setup_data_template ve_setup_32_uncoupled={
   11,
   rate_mapping_32_un,
   quality_mapping_44,
Index: libvorbis-1.2.0/lib/modes/setup_44.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_44.h
+++ libvorbis-1.2.0/lib/modes/setup_44.h
@@ -19,42 +19,42 @@
 #include "modes/residue_44.h"
 #include "modes/psych_44.h"
 
-static double rate_mapping_44_stereo[12]={
+static const double rate_mapping_44_stereo[12]={
   22500.,32000.,40000.,48000.,56000.,64000.,
   80000.,96000.,112000.,128000.,160000.,250001.
 };
 
-static double quality_mapping_44[12]={
+static const double quality_mapping_44[12]={
   -.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0
 };
 
-static int blocksize_short_44[11]={
+static const int blocksize_short_44[11]={
   512,256,256,256,256,256,256,256,256,256,256
 };
-static int blocksize_long_44[11]={
+static const int blocksize_long_44[11]={
   4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048
 };
 
-static double _psy_compand_short_mapping[12]={
+static const double _psy_compand_short_mapping[12]={
   0.5, 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.
 };
-static double _psy_compand_long_mapping[12]={
+static const double _psy_compand_long_mapping[12]={
   3.5, 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5.
 };
 
-static double _global_mapping_44[12]={
+static const double _global_mapping_44[12]={
   /* 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4. */
  0., 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4.
 };
 
-static int _floor_short_mapping_44[11]={
+static const int _floor_short_mapping_44[11]={
   1,0,0,2,2,4,5,5,5,5,5
 };
-static int _floor_long_mapping_44[11]={
+static const int _floor_long_mapping_44[11]={
   8,7,7,7,7,7,7,7,7,7,7
 };
 
-ve_setup_data_template ve_setup_44_stereo={
+static const ve_setup_data_template ve_setup_44_stereo={
   11,
   rate_mapping_44_stereo,
   quality_mapping_44,
Index: libvorbis-1.2.0/lib/modes/setup_44u.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_44u.h
+++ libvorbis-1.2.0/lib/modes/setup_44u.h
@@ -17,12 +17,12 @@
 
 #include "modes/residue_44u.h"
 
-static double rate_mapping_44_un[12]={
+static const double rate_mapping_44_un[12]={
   32000.,48000.,60000.,70000.,80000.,86000.,
   96000.,110000.,120000.,140000.,160000.,240001.
 };
 
-ve_setup_data_template ve_setup_44_uncoupled={
+static const ve_setup_data_template ve_setup_44_uncoupled={
   11,
   rate_mapping_44_un,
   quality_mapping_44,
Index: libvorbis-1.2.0/lib/modes/setup_8.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_8.h
+++ libvorbis-1.2.0/lib/modes/setup_8.h
@@ -18,31 +18,31 @@
 #include "psych_8.h"
 #include "residue_8.h"
 
-static int blocksize_8[2]={
+static const int blocksize_8[2]={
   512,512
 };
 
-static int _floor_mapping_8[2]={
+static const int _floor_mapping_8[2]={
   6,6,
 };
 
-static double rate_mapping_8[3]={
+static const double rate_mapping_8[3]={
   6000.,9000.,32000.,
 };
 
-static double rate_mapping_8_uncoupled[3]={
+static const double rate_mapping_8_uncoupled[3]={
   8000.,14000.,42000.,
 };
 
-static double quality_mapping_8[3]={
+static const double quality_mapping_8[3]={
   -.1,.0,1.
 };
 
-static double _psy_compand_8_mapping[3]={ 0., 1., 1.};
+static const double _psy_compand_8_mapping[3]={ 0., 1., 1.};
 
-static double _global_mapping_8[3]={ 1., 2., 3. };
+static const double _global_mapping_8[3]={ 1., 2., 3. };
 
-ve_setup_data_template ve_setup_8_stereo={
+static const ve_setup_data_template ve_setup_8_stereo={
   2,
   rate_mapping_8,
   quality_mapping_8,
@@ -93,7 +93,7 @@ ve_setup_data_template ve_setup_8_stereo
   _mapres_template_8_stereo
 };
 
-ve_setup_data_template ve_setup_8_uncoupled={
+static const ve_setup_data_template ve_setup_8_uncoupled={
   2,
   rate_mapping_8_uncoupled,
   quality_mapping_8,
Index: libvorbis-1.2.0/lib/modes/setup_X.h
===================================================================
--- libvorbis-1.2.0.orig/lib/modes/setup_X.h
+++ libvorbis-1.2.0/lib/modes/setup_X.h
@@ -15,12 +15,12 @@
 
  ********************************************************************/
 
-static double rate_mapping_X[12]={
+static const double rate_mapping_X[12]={
   -1.,-1.,-1.,-1.,-1.,-1.,
   -1.,-1.,-1.,-1.,-1.,-1.
 };
 
-ve_setup_data_template ve_setup_X_stereo={
+static const ve_setup_data_template ve_setup_X_stereo={
   11,
   rate_mapping_X,
   quality_mapping_44,
@@ -71,7 +71,7 @@ ve_setup_data_template ve_setup_X_stereo
   _mapres_template_44_stereo
 };
 
-ve_setup_data_template ve_setup_X_uncoupled={
+static const ve_setup_data_template ve_setup_X_uncoupled={
   11,
   rate_mapping_X,
   quality_mapping_44,
@@ -122,7 +122,7 @@ ve_setup_data_template ve_setup_X_uncoup
   _mapres_template_44_uncoupled
 };
 
-ve_setup_data_template ve_setup_XX_stereo={
+static const ve_setup_data_template ve_setup_XX_stereo={
   2,
   rate_mapping_X,
   quality_mapping_8,
@@ -173,7 +173,7 @@ ve_setup_data_template ve_setup_XX_stere
   _mapres_template_8_stereo
 };
 
-ve_setup_data_template ve_setup_XX_uncoupled={
+static const ve_setup_data_template ve_setup_XX_uncoupled={
   2,
   rate_mapping_X,
   quality_mapping_8,
Index: libvorbis-1.2.0/lib/res0.c
===================================================================
--- libvorbis-1.2.0.orig/lib/res0.c
+++ libvorbis-1.2.0/lib/res0.c
@@ -884,7 +884,7 @@ int res2_inverse(vorbis_block *vb,vorbis
 }
 
 
-vorbis_func_residue residue0_exportbundle={
+const vorbis_func_residue residue0_exportbundle={
   NULL,
   &res0_unpack,
   &res0_look,
@@ -895,7 +895,7 @@ vorbis_func_residue residue0_exportbundl
   &res0_inverse
 };
 
-vorbis_func_residue residue1_exportbundle={
+const vorbis_func_residue residue1_exportbundle={
   &res0_pack,
   &res0_unpack,
   &res0_look,
@@ -906,7 +906,7 @@ vorbis_func_residue residue1_exportbundl
   &res1_inverse
 };
 
-vorbis_func_residue residue2_exportbundle={
+const vorbis_func_residue residue2_exportbundle={
   &res0_pack,
   &res0_unpack,
   &res0_look,
Index: libvorbis-1.2.0/lib/backends.h
===================================================================
--- libvorbis-1.2.0.orig/lib/backends.h
+++ libvorbis-1.2.0/lib/backends.h
@@ -113,9 +113,8 @@ typedef struct vorbis_info_residue0{
   int    secondstages[64]; /* expanded out to pointers in lookup */
   int    booklist[256];    /* list of second stage books */
 
-  float  classmetric1[64];  
-  float  classmetric2[64];  
-
+  const float classmetric1[64];  
+  const float classmetric2[64];  
 } vorbis_info_residue0;
 
 /* Mapping backend generic *****************************************/
Index: libvorbis-1.2.0/lib/highlevel.h
===================================================================
--- libvorbis-1.2.0.orig/lib/highlevel.h
+++ libvorbis-1.2.0/lib/highlevel.h
@@ -23,7 +23,7 @@ typedef struct highlevel_byblocktype {
 } highlevel_byblocktype;
   
 typedef struct highlevel_encode_setup {
-  void *setup;
+  const void *setup;
   int   set_in_stone;
 
   double base_setting;
Index: libvorbis-1.2.0/lib/vorbisenc.c
===================================================================
--- libvorbis-1.2.0.orig/lib/vorbisenc.c
+++ libvorbis-1.2.0/lib/vorbisenc.c
@@ -38,16 +38,16 @@ typedef struct {
 typedef struct {
   int res_type;
   int limit_type; /* 0 lowpass limited, 1 point stereo limited */
-  vorbis_info_residue0 *res;
+  const vorbis_info_residue0 *res;
   static_codebook  *book_aux;
   static_codebook  *book_aux_managed;
-  static_bookblock *books_base;
-  static_bookblock *books_base_managed;
+  const static_bookblock *books_base;
+  const static_bookblock *books_base_managed;
 } vorbis_residue_template;
 
 typedef struct {
-  vorbis_info_mapping0    *map;
-  vorbis_residue_template *res;
+  const vorbis_info_mapping0    *map;
+  const vorbis_residue_template *res;
 } vorbis_mapping_template;
 
 typedef struct vp_adjblock{
@@ -90,63 +90,63 @@ typedef struct {
 
 typedef struct {
   int      mappings;
-  double  *rate_mapping;
-  double  *quality_mapping;
+  const double  *rate_mapping;
+  const double  *quality_mapping;
   int      coupling_restriction;
   long     samplerate_min_restriction;
   long     samplerate_max_restriction;
 
 
-  int     *blocksize_short;
-  int     *blocksize_long;
+  const int     *blocksize_short;
+  const int     *blocksize_long;
 
-  att3    *psy_tone_masteratt;
-  int     *psy_tone_0dB;
-  int     *psy_tone_dBsuppress;
-
-  vp_adjblock *psy_tone_adj_impulse;
-  vp_adjblock *psy_tone_adj_long;
-  vp_adjblock *psy_tone_adj_other;
-
-  noiseguard  *psy_noiseguards;
-  noise3      *psy_noise_bias_impulse;
-  noise3      *psy_noise_bias_padding;
-  noise3      *psy_noise_bias_trans;
-  noise3      *psy_noise_bias_long;
-  int         *psy_noise_dBsuppress;
-
-  compandblock  *psy_noise_compand;
-  double        *psy_noise_compand_short_mapping;
-  double        *psy_noise_compand_long_mapping;
-
-  int      *psy_noise_normal_start[2];
-  int      *psy_noise_normal_partition[2];
-  double   *psy_noise_normal_thresh;
-
-  int      *psy_ath_float;
-  int      *psy_ath_abs;
-
-  double   *psy_lowpass;
-
-  vorbis_info_psy_global *global_params;
-  double     *global_mapping;
-  adj_stereo *stereo_modes;
-
-  static_codebook ***floor_books;
-  vorbis_info_floor1 *floor_params;
-  int *floor_short_mapping;
-  int *floor_long_mapping;
+  const att3    *psy_tone_masteratt;
+  const int     *psy_tone_0dB;
+  const int     *psy_tone_dBsuppress;
+
+  const vp_adjblock *psy_tone_adj_impulse;
+  const vp_adjblock *psy_tone_adj_long;
+  const vp_adjblock *psy_tone_adj_other;
+
+  const noiseguard  *psy_noiseguards;
+  const noise3      *psy_noise_bias_impulse;
+  const noise3      *psy_noise_bias_padding;
+  const noise3      *psy_noise_bias_trans;
+  const noise3      *psy_noise_bias_long;
+  const int         *psy_noise_dBsuppress;
+
+  const compandblock  *psy_noise_compand;
+  const double        *psy_noise_compand_short_mapping;
+  const double        *psy_noise_compand_long_mapping;
+
+  const int      *psy_noise_normal_start[2];
+  const int      *psy_noise_normal_partition[2];
+  const double   *psy_noise_normal_thresh;
+
+  const int      *psy_ath_float;
+  const int      *psy_ath_abs;
+
+  const double   *psy_lowpass;
+
+  const vorbis_info_psy_global *global_params;
+  const double     *global_mapping;
+  const adj_stereo *stereo_modes;
+
+  const static_codebook ***floor_books;
+  const vorbis_info_floor1 *floor_params;
+  const int *floor_short_mapping;
+  const int *floor_long_mapping;
 
-  vorbis_mapping_template *maps;
+  const vorbis_mapping_template *maps;
 } ve_setup_data_template;
 
 /* a few static coder conventions */
-static vorbis_info_mode _mode_template[2]={
+static const vorbis_info_mode _mode_template[2]={
   {0,0,0,0},
   {1,0,0,1}
 };
 
-static vorbis_info_mapping0 _map_nominal[2]={
+static const vorbis_info_mapping0 _map_nominal[2]={
   {1, {0,0}, {0}, {0}, 1,{0},{1}},
   {1, {0,0}, {1}, {1}, 1,{0},{1}}
 };
@@ -160,7 +160,7 @@ static vorbis_info_mapping0 _map_nominal
 #include "modes/setup_22.h"
 #include "modes/setup_X.h"
 
-static ve_setup_data_template *setup_list[]={
+static const ve_setup_data_template *const setup_list[]={
   &ve_setup_44_stereo,
   &ve_setup_44_uncoupled,
 
@@ -197,9 +197,9 @@ static int vorbis_encode_toplevel_setup(
 }
 
 static void vorbis_encode_floor_setup(vorbis_info *vi,double s,int block,
-				     static_codebook    ***books, 
-				     vorbis_info_floor1 *in, 
-				     int *x){
+				     const static_codebook    ***books, 
+				     const vorbis_info_floor1 *in, 
+				     const int *x){
   int i,k,is=s;
   vorbis_info_floor1 *f=_ogg_calloc(1,sizeof(*f));
   codec_setup_info *ci=vi->codec_setup;
@@ -452,7 +452,7 @@ static int book_dup_or_new(codec_setup_i
 }
 
 static void vorbis_encode_blocksize_setup(vorbis_info *vi,double s,
-					 int *shortb,int *longb){
+					 const int *shortb,const int *longb){
 
   codec_setup_info *ci=vi->codec_setup;
   int is=s;
@@ -580,9 +580,9 @@ static void vorbis_encode_map_n_res_setu
 
   codec_setup_info *ci=vi->codec_setup;
   int i,j,is=s,modes=2;
-  vorbis_info_mapping0 *map=maps[is].map;
+  const vorbis_info_mapping0 *map=maps[is].map;
   vorbis_info_mode *mode=_mode_template;
-  vorbis_residue_template *res=maps[is].res;
+  const vorbis_residue_template *res=maps[is].res;
 
   if(ci->blocksizes[0]==ci->blocksizes[1])modes=1;
 
@@ -611,7 +611,7 @@ static double setting_to_approx_bitrate(
   int is=hi->base_setting;
   double ds=hi->base_setting-is;
   int ch=vi->channels;
-  double *r=setup->rate_mapping;
+  const double *r=setup->rate_mapping;
 
   if(r==NULL)
     return(-1);
@@ -633,7 +633,7 @@ static void get_setup_template(vorbis_in
       if(srate>=setup_list[i]->samplerate_min_restriction &&
 	 srate<=setup_list[i]->samplerate_max_restriction){
 	int mappings=setup_list[i]->mappings;
-	double *map=(q_or_bitrate?
+	const double *map=(q_or_bitrate?
 		     setup_list[i]->rate_mapping:
 		     setup_list[i]->quality_mapping);
 
@@ -860,7 +860,7 @@ static int vorbis_encode_setup_setting(v
   int ret=0,i,is;
   codec_setup_info *ci=vi->codec_setup;
   highlevel_encode_setup *hi=&ci->hi;
-  ve_setup_data_template *setup=hi->setup;
+  const ve_setup_data_template *setup=hi->setup;
   double ds;
 
   ret=vorbis_encode_toplevel_setup(vi,channels,rate);
Index: libvorbis-1.2.0/lib/books/uncoupled/res_books_uncoupled.h
===================================================================
--- libvorbis-1.2.0.orig/lib/books/uncoupled/res_books_uncoupled.h
+++ libvorbis-1.2.0/lib/books/uncoupled/res_books_uncoupled.h
@@ -16,13 +16,13 @@
  ********************************************************************/
 
 #include "codebook.h"
-static long _vq_quantlist__16u0__p1_0[] = {
+static const long _vq_quantlist__16u0__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u0__p1_0[] = {
+static const long _vq_lengthlist__16u0__p1_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 8, 5, 8, 8, 8,10,10, 8,
 	10,11, 5, 8, 8, 8,10,10, 8,10,10, 4, 9, 9, 9,12,
 	11, 8,11,11, 8,12,11,10,12,14,10,13,13, 7,11,11,
@@ -31,22 +31,22 @@ static long _vq_lengthlist__16u0__p1_0[]
 	12,
 };
 
-static float _vq_quantthresh__16u0__p1_0[] = {
+static const float _vq_quantthresh__16u0__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16u0__p1_0[] = {
+static const long _vq_quantmap__16u0__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p1_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p1_0 = {
 	_vq_quantthresh__16u0__p1_0,
 	_vq_quantmap__16u0__p1_0,
 	3,
 	3
 };
 
-static static_codebook _16u0__p1_0 = {
+static const static_codebook _16u0__p1_0 = {
 	4, 81,
 	_vq_lengthlist__16u0__p1_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -57,13 +57,13 @@ static static_codebook _16u0__p1_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p2_0[] = {
+static const long _vq_quantlist__16u0__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u0__p2_0[] = {
+static const long _vq_lengthlist__16u0__p2_0[] = {
 	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 9, 7,
 	 8, 9, 5, 7, 7, 7, 9, 8, 7, 9, 7, 4, 7, 7, 7, 9,
 	 9, 7, 8, 8, 6, 9, 8, 7, 8,11, 9,11,10, 6, 8, 9,
@@ -72,22 +72,22 @@ static long _vq_lengthlist__16u0__p2_0[]
 	 8,
 };
 
-static float _vq_quantthresh__16u0__p2_0[] = {
+static const float _vq_quantthresh__16u0__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16u0__p2_0[] = {
+static const long _vq_quantmap__16u0__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p2_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p2_0 = {
 	_vq_quantthresh__16u0__p2_0,
 	_vq_quantmap__16u0__p2_0,
 	3,
 	3
 };
 
-static static_codebook _16u0__p2_0 = {
+static const static_codebook _16u0__p2_0 = {
 	4, 81,
 	_vq_lengthlist__16u0__p2_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -98,7 +98,7 @@ static static_codebook _16u0__p2_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p3_0[] = {
+static const long _vq_quantlist__16u0__p3_0[] = {
 	2,
 	1,
 	3,
@@ -106,7 +106,7 @@ static long _vq_quantlist__16u0__p3_0[] 
 	4,
 };
 
-static long _vq_lengthlist__16u0__p3_0[] = {
+static const long _vq_lengthlist__16u0__p3_0[] = {
 	 1, 5, 5, 7, 7, 6, 7, 7, 8, 8, 6, 7, 8, 8, 8, 8,
 	 9, 9,11,11, 8, 9, 9,11,11, 6, 9, 8,10,10, 8,10,
 	10,11,11, 8,10,10,11,11,10,11,10,13,12, 9,11,10,
@@ -149,22 +149,22 @@ static long _vq_lengthlist__16u0__p3_0[]
 	18,
 };
 
-static float _vq_quantthresh__16u0__p3_0[] = {
+static const float _vq_quantthresh__16u0__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u0__p3_0[] = {
+static const long _vq_quantmap__16u0__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p3_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p3_0 = {
 	_vq_quantthresh__16u0__p3_0,
 	_vq_quantmap__16u0__p3_0,
 	5,
 	5
 };
 
-static static_codebook _16u0__p3_0 = {
+static const static_codebook _16u0__p3_0 = {
 	4, 625,
 	_vq_lengthlist__16u0__p3_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -175,7 +175,7 @@ static static_codebook _16u0__p3_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p4_0[] = {
+static const long _vq_quantlist__16u0__p4_0[] = {
 	2,
 	1,
 	3,
@@ -183,7 +183,7 @@ static long _vq_quantlist__16u0__p4_0[] 
 	4,
 };
 
-static long _vq_lengthlist__16u0__p4_0[] = {
+static const long _vq_lengthlist__16u0__p4_0[] = {
 	 3, 5, 5, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 9,
 	10, 9,11,11, 9, 9, 9,11,11, 6, 7, 7,10,10, 7, 7,
 	 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10,
@@ -226,22 +226,22 @@ static long _vq_lengthlist__16u0__p4_0[]
 	11,
 };
 
-static float _vq_quantthresh__16u0__p4_0[] = {
+static const float _vq_quantthresh__16u0__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u0__p4_0[] = {
+static const long _vq_quantmap__16u0__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p4_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p4_0 = {
 	_vq_quantthresh__16u0__p4_0,
 	_vq_quantmap__16u0__p4_0,
 	5,
 	5
 };
 
-static static_codebook _16u0__p4_0 = {
+static const static_codebook _16u0__p4_0 = {
 	4, 625,
 	_vq_lengthlist__16u0__p4_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -252,7 +252,7 @@ static static_codebook _16u0__p4_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p5_0[] = {
+static const long _vq_quantlist__16u0__p5_0[] = {
 	4,
 	3,
 	5,
@@ -264,7 +264,7 @@ static long _vq_quantlist__16u0__p5_0[] 
 	8,
 };
 
-static long _vq_lengthlist__16u0__p5_0[] = {
+static const long _vq_lengthlist__16u0__p5_0[] = {
 	 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8,
 	 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9,
 	 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 7, 8, 8,
@@ -273,23 +273,23 @@ static long _vq_lengthlist__16u0__p5_0[]
 	12,
 };
 
-static float _vq_quantthresh__16u0__p5_0[] = {
+static const float _vq_quantthresh__16u0__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16u0__p5_0[] = {
+static const long _vq_quantmap__16u0__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p5_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p5_0 = {
 	_vq_quantthresh__16u0__p5_0,
 	_vq_quantmap__16u0__p5_0,
 	9,
 	9
 };
 
-static static_codebook _16u0__p5_0 = {
+static const static_codebook _16u0__p5_0 = {
 	2, 81,
 	_vq_lengthlist__16u0__p5_0,
 	1, -531628032, 1611661312, 4, 0,
@@ -300,7 +300,7 @@ static static_codebook _16u0__p5_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p6_0[] = {
+static const long _vq_quantlist__16u0__p6_0[] = {
 	6,
 	5,
 	7,
@@ -316,7 +316,7 @@ static long _vq_quantlist__16u0__p6_0[] 
 	12,
 };
 
-static long _vq_lengthlist__16u0__p6_0[] = {
+static const long _vq_lengthlist__16u0__p6_0[] = {
 	 1, 4, 4, 7, 7,10,10,12,12,13,13,18,17, 3, 6, 6,
 	 9, 9,11,11,13,13,14,14,18,17, 3, 6, 6, 9, 9,11,
 	11,13,13,14,14,17,18, 7, 9, 9,11,11,13,13,14,14,
@@ -330,24 +330,24 @@ static long _vq_lengthlist__16u0__p6_0[]
 	18, 0,19, 0, 0, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__16u0__p6_0[] = {
+static const float _vq_quantthresh__16u0__p6_0[] = {
 	-27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 
 	12.5, 17.5, 22.5, 27.5, 
 };
 
-static long _vq_quantmap__16u0__p6_0[] = {
+static const long _vq_quantmap__16u0__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p6_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p6_0 = {
 	_vq_quantthresh__16u0__p6_0,
 	_vq_quantmap__16u0__p6_0,
 	13,
 	13
 };
 
-static static_codebook _16u0__p6_0 = {
+static const static_codebook _16u0__p6_0 = {
 	2, 169,
 	_vq_lengthlist__16u0__p6_0,
 	1, -526516224, 1616117760, 4, 0,
@@ -358,7 +358,7 @@ static static_codebook _16u0__p6_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p6_1[] = {
+static const long _vq_quantlist__16u0__p6_1[] = {
 	2,
 	1,
 	3,
@@ -366,27 +366,27 @@ static long _vq_quantlist__16u0__p6_1[] 
 	4,
 };
 
-static long _vq_lengthlist__16u0__p6_1[] = {
+static const long _vq_lengthlist__16u0__p6_1[] = {
 	 1, 4, 5, 6, 6, 4, 6, 6, 6, 6, 4, 6, 6, 6, 6, 6,
 	 6, 6, 7, 7, 6, 6, 6, 7, 7,
 };
 
-static float _vq_quantthresh__16u0__p6_1[] = {
+static const float _vq_quantthresh__16u0__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u0__p6_1[] = {
+static const long _vq_quantmap__16u0__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p6_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p6_1 = {
 	_vq_quantthresh__16u0__p6_1,
 	_vq_quantmap__16u0__p6_1,
 	5,
 	5
 };
 
-static static_codebook _16u0__p6_1 = {
+static const static_codebook _16u0__p6_1 = {
 	2, 25,
 	_vq_lengthlist__16u0__p6_1,
 	1, -533725184, 1611661312, 3, 0,
@@ -397,13 +397,13 @@ static static_codebook _16u0__p6_1 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p7_0[] = {
+static const long _vq_quantlist__16u0__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u0__p7_0[] = {
+static const long _vq_lengthlist__16u0__p7_0[] = {
 	 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
@@ -412,22 +412,22 @@ static long _vq_lengthlist__16u0__p7_0[]
 	 7,
 };
 
-static float _vq_quantthresh__16u0__p7_0[] = {
+static const float _vq_quantthresh__16u0__p7_0[] = {
 	-157.5, 157.5, 
 };
 
-static long _vq_quantmap__16u0__p7_0[] = {
+static const long _vq_quantmap__16u0__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p7_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p7_0 = {
 	_vq_quantthresh__16u0__p7_0,
 	_vq_quantmap__16u0__p7_0,
 	3,
 	3
 };
 
-static static_codebook _16u0__p7_0 = {
+static const static_codebook _16u0__p7_0 = {
 	4, 81,
 	_vq_lengthlist__16u0__p7_0,
 	1, -518803456, 1628680192, 2, 0,
@@ -438,7 +438,7 @@ static static_codebook _16u0__p7_0 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p7_1[] = {
+static const long _vq_quantlist__16u0__p7_1[] = {
 	7,
 	6,
 	8,
@@ -456,7 +456,7 @@ static long _vq_quantlist__16u0__p7_1[] 
 	14,
 };
 
-static long _vq_lengthlist__16u0__p7_1[] = {
+static const long _vq_lengthlist__16u0__p7_1[] = {
 	 1, 5, 5, 6, 5, 9,10,11,11,10,10,10,10,10,10, 5,
 	 8, 8, 8,10,10,10,10,10,10,10,10,10,10,10, 5, 8,
 	 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 5,10, 8,
@@ -474,24 +474,24 @@ static long _vq_lengthlist__16u0__p7_1[]
 	10,
 };
 
-static float _vq_quantthresh__16u0__p7_1[] = {
+static const float _vq_quantthresh__16u0__p7_1[] = {
 	-136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, 
 	31.5, 52.5, 73.5, 94.5, 115.5, 136.5, 
 };
 
-static long _vq_quantmap__16u0__p7_1[] = {
+static const long _vq_quantmap__16u0__p7_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p7_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p7_1 = {
 	_vq_quantthresh__16u0__p7_1,
 	_vq_quantmap__16u0__p7_1,
 	15,
 	15
 };
 
-static static_codebook _16u0__p7_1 = {
+static const static_codebook _16u0__p7_1 = {
 	2, 225,
 	_vq_lengthlist__16u0__p7_1,
 	1, -520986624, 1620377600, 4, 0,
@@ -502,7 +502,7 @@ static static_codebook _16u0__p7_1 = {
 	0
 };
 
-static long _vq_quantlist__16u0__p7_2[] = {
+static const long _vq_quantlist__16u0__p7_2[] = {
 	10,
 	9,
 	11,
@@ -526,7 +526,7 @@ static long _vq_quantlist__16u0__p7_2[] 
 	20,
 };
 
-static long _vq_lengthlist__16u0__p7_2[] = {
+static const long _vq_lengthlist__16u0__p7_2[] = {
 	 1, 6, 6, 7, 8, 7, 7,10, 9,10, 9,11,10, 9,11,10,
 	 9, 9, 9, 9,10, 6, 8, 7, 9, 9, 8, 8,10,10, 9,11,
 	11,12,12,10, 9,11, 9,12,10, 9, 6, 9, 8, 9,12, 8,
@@ -557,26 +557,26 @@ static long _vq_lengthlist__16u0__p7_2[]
 	10,10,12,11,10,11,11,11,10,
 };
 
-static float _vq_quantthresh__16u0__p7_2[] = {
+static const float _vq_quantthresh__16u0__p7_2[] = {
 	-9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, 
 	-1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 
 	6.5, 7.5, 8.5, 9.5, 
 };
 
-static long _vq_quantmap__16u0__p7_2[] = {
+static const long _vq_quantmap__16u0__p7_2[] = {
 	   19,   17,   15,   13,   11,    9,    7,    5,
 	    3,    1,    0,    2,    4,    6,    8,   10,
 	   12,   14,   16,   18,   20,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u0__p7_2 = {
+static const encode_aux_threshmatch _vq_auxt__16u0__p7_2 = {
 	_vq_quantthresh__16u0__p7_2,
 	_vq_quantmap__16u0__p7_2,
 	21,
 	21
 };
 
-static static_codebook _16u0__p7_2 = {
+static const static_codebook _16u0__p7_2 = {
 	2, 441,
 	_vq_lengthlist__16u0__p7_2,
 	1, -529268736, 1611661312, 5, 0,
@@ -587,14 +587,14 @@ static static_codebook _16u0__p7_2 = {
 	0
 };
 
-static long _huff_lengthlist__16u0__single[] = {
+static const long _huff_lengthlist__16u0__single[] = {
 	 3, 5, 8, 7,14, 8, 9,19, 5, 2, 5, 5, 9, 6, 9,19,
 	 8, 4, 5, 7, 8, 9,13,19, 7, 4, 6, 5, 9, 6, 9,19,
 	12, 8, 7, 9,10,11,13,19, 8, 5, 8, 6, 9, 6, 7,19,
 	 8, 8,10, 7, 7, 4, 5,19,12,17,19,15,18,13,11,18,
 };
 
-static static_codebook _huff_book__16u0__single = {
+static const static_codebook _huff_book__16u0__single = {
 	2, 64,
 	_huff_lengthlist__16u0__single,
 	0, 0, 0, 0, 0,
@@ -605,7 +605,7 @@ static static_codebook _huff_book__16u0_
 	0
 };
 
-static long _huff_lengthlist__16u1__long[] = {
+static const long _huff_lengthlist__16u1__long[] = {
 	 3, 6,10, 8,12, 8,14, 8,14,19, 5, 3, 5, 5, 7, 6,
 	11, 7,16,19, 7, 5, 6, 7, 7, 9,11,12,19,19, 6, 4,
 	 7, 5, 7, 6,10, 7,18,18, 8, 6, 7, 7, 7, 7, 8, 9,
@@ -615,7 +615,7 @@ static long _huff_lengthlist__16u1__long
 	16,13,16,18,
 };
 
-static static_codebook _huff_book__16u1__long = {
+static const static_codebook _huff_book__16u1__long = {
 	2, 100,
 	_huff_lengthlist__16u1__long,
 	0, 0, 0, 0, 0,
@@ -626,13 +626,13 @@ static static_codebook _huff_book__16u1_
 	0
 };
 
-static long _vq_quantlist__16u1__p1_0[] = {
+static const long _vq_quantlist__16u1__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u1__p1_0[] = {
+static const long _vq_lengthlist__16u1__p1_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7,10,10, 7,
 	 9,10, 5, 7, 8, 7,10, 9, 7,10,10, 5, 8, 8, 8,10,
 	10, 8,10,10, 7,10,10,10,11,12,10,12,13, 7,10,10,
@@ -641,22 +641,22 @@ static long _vq_lengthlist__16u1__p1_0[]
 	11,
 };
 
-static float _vq_quantthresh__16u1__p1_0[] = {
+static const float _vq_quantthresh__16u1__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16u1__p1_0[] = {
+static const long _vq_quantmap__16u1__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p1_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p1_0 = {
 	_vq_quantthresh__16u1__p1_0,
 	_vq_quantmap__16u1__p1_0,
 	3,
 	3
 };
 
-static static_codebook _16u1__p1_0 = {
+static const static_codebook _16u1__p1_0 = {
 	4, 81,
 	_vq_lengthlist__16u1__p1_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -667,13 +667,13 @@ static static_codebook _16u1__p1_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p2_0[] = {
+static const long _vq_quantlist__16u1__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u1__p2_0[] = {
+static const long _vq_lengthlist__16u1__p2_0[] = {
 	 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6,
 	 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8,
 	 8, 6, 8, 8, 6, 8, 8, 7, 7,10, 8, 9, 9, 6, 8, 8,
@@ -682,22 +682,22 @@ static long _vq_lengthlist__16u1__p2_0[]
 	 8,
 };
 
-static float _vq_quantthresh__16u1__p2_0[] = {
+static const float _vq_quantthresh__16u1__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16u1__p2_0[] = {
+static const long _vq_quantmap__16u1__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p2_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p2_0 = {
 	_vq_quantthresh__16u1__p2_0,
 	_vq_quantmap__16u1__p2_0,
 	3,
 	3
 };
 
-static static_codebook _16u1__p2_0 = {
+static const static_codebook _16u1__p2_0 = {
 	4, 81,
 	_vq_lengthlist__16u1__p2_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -708,7 +708,7 @@ static static_codebook _16u1__p2_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p3_0[] = {
+static const long _vq_quantlist__16u1__p3_0[] = {
 	2,
 	1,
 	3,
@@ -716,7 +716,7 @@ static long _vq_quantlist__16u1__p3_0[] 
 	4,
 };
 
-static long _vq_lengthlist__16u1__p3_0[] = {
+static const long _vq_lengthlist__16u1__p3_0[] = {
 	 1, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
 	10, 9,11,11, 9, 9,10,11,11, 6, 8, 8,10,10, 8, 9,
 	10,11,11, 8, 9,10,11,11,10,11,11,12,13,10,11,11,
@@ -759,22 +759,22 @@ static long _vq_lengthlist__16u1__p3_0[]
 	16,
 };
 
-static float _vq_quantthresh__16u1__p3_0[] = {
+static const float _vq_quantthresh__16u1__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u1__p3_0[] = {
+static const long _vq_quantmap__16u1__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p3_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p3_0 = {
 	_vq_quantthresh__16u1__p3_0,
 	_vq_quantmap__16u1__p3_0,
 	5,
 	5
 };
 
-static static_codebook _16u1__p3_0 = {
+static const static_codebook _16u1__p3_0 = {
 	4, 625,
 	_vq_lengthlist__16u1__p3_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -785,7 +785,7 @@ static static_codebook _16u1__p3_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p4_0[] = {
+static const long _vq_quantlist__16u1__p4_0[] = {
 	2,
 	1,
 	3,
@@ -793,7 +793,7 @@ static long _vq_quantlist__16u1__p4_0[] 
 	4,
 };
 
-static long _vq_lengthlist__16u1__p4_0[] = {
+static const long _vq_lengthlist__16u1__p4_0[] = {
 	 4, 5, 5, 8, 8, 6, 6, 7, 9, 9, 6, 6, 6, 9, 9, 9,
 	10, 9,11,11, 9, 9,10,11,11, 6, 7, 7,10, 9, 7, 7,
 	 8, 9,10, 7, 7, 8,10,10,10,10,10,10,12, 9, 9,10,
@@ -836,22 +836,22 @@ static long _vq_lengthlist__16u1__p4_0[]
 	11,
 };
 
-static float _vq_quantthresh__16u1__p4_0[] = {
+static const float _vq_quantthresh__16u1__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u1__p4_0[] = {
+static const long _vq_quantmap__16u1__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p4_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p4_0 = {
 	_vq_quantthresh__16u1__p4_0,
 	_vq_quantmap__16u1__p4_0,
 	5,
 	5
 };
 
-static static_codebook _16u1__p4_0 = {
+static const static_codebook _16u1__p4_0 = {
 	4, 625,
 	_vq_lengthlist__16u1__p4_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -862,7 +862,7 @@ static static_codebook _16u1__p4_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p5_0[] = {
+static const long _vq_quantlist__16u1__p5_0[] = {
 	4,
 	3,
 	5,
@@ -874,7 +874,7 @@ static long _vq_quantlist__16u1__p5_0[] 
 	8,
 };
 
-static long _vq_lengthlist__16u1__p5_0[] = {
+static const long _vq_lengthlist__16u1__p5_0[] = {
 	 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8,
 	10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9,
 	 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8,
@@ -883,23 +883,23 @@ static long _vq_lengthlist__16u1__p5_0[]
 	13,
 };
 
-static float _vq_quantthresh__16u1__p5_0[] = {
+static const float _vq_quantthresh__16u1__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16u1__p5_0[] = {
+static const long _vq_quantmap__16u1__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p5_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p5_0 = {
 	_vq_quantthresh__16u1__p5_0,
 	_vq_quantmap__16u1__p5_0,
 	9,
 	9
 };
 
-static static_codebook _16u1__p5_0 = {
+static const static_codebook _16u1__p5_0 = {
 	2, 81,
 	_vq_lengthlist__16u1__p5_0,
 	1, -531628032, 1611661312, 4, 0,
@@ -910,7 +910,7 @@ static static_codebook _16u1__p5_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p6_0[] = {
+static const long _vq_quantlist__16u1__p6_0[] = {
 	4,
 	3,
 	5,
@@ -922,7 +922,7 @@ static long _vq_quantlist__16u1__p6_0[] 
 	8,
 };
 
-static long _vq_lengthlist__16u1__p6_0[] = {
+static const long _vq_lengthlist__16u1__p6_0[] = {
 	 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 8, 8,
 	 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7,
 	 8, 8,10, 9, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7,
@@ -931,23 +931,23 @@ static long _vq_lengthlist__16u1__p6_0[]
 	11,
 };
 
-static float _vq_quantthresh__16u1__p6_0[] = {
+static const float _vq_quantthresh__16u1__p6_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16u1__p6_0[] = {
+static const long _vq_quantmap__16u1__p6_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p6_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p6_0 = {
 	_vq_quantthresh__16u1__p6_0,
 	_vq_quantmap__16u1__p6_0,
 	9,
 	9
 };
 
-static static_codebook _16u1__p6_0 = {
+static const static_codebook _16u1__p6_0 = {
 	2, 81,
 	_vq_lengthlist__16u1__p6_0,
 	1, -531628032, 1611661312, 4, 0,
@@ -958,13 +958,13 @@ static static_codebook _16u1__p6_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p7_0[] = {
+static const long _vq_quantlist__16u1__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u1__p7_0[] = {
+static const long _vq_lengthlist__16u1__p7_0[] = {
 	 1, 4, 4, 4, 8, 8, 4, 8, 8, 5,11, 9, 8,12,11, 8,
 	12,11, 5,10,11, 8,11,12, 8,11,12, 4,11,11,11,14,
 	13,10,13,13, 8,14,13,12,14,16,12,16,15, 8,14,14,
@@ -973,22 +973,22 @@ static long _vq_lengthlist__16u1__p7_0[]
 	13,
 };
 
-static float _vq_quantthresh__16u1__p7_0[] = {
+static const float _vq_quantthresh__16u1__p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__16u1__p7_0[] = {
+static const long _vq_quantmap__16u1__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p7_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p7_0 = {
 	_vq_quantthresh__16u1__p7_0,
 	_vq_quantmap__16u1__p7_0,
 	3,
 	3
 };
 
-static static_codebook _16u1__p7_0 = {
+static const static_codebook _16u1__p7_0 = {
 	4, 81,
 	_vq_lengthlist__16u1__p7_0,
 	1, -529137664, 1618345984, 2, 0,
@@ -999,7 +999,7 @@ static static_codebook _16u1__p7_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p7_1[] = {
+static const long _vq_quantlist__16u1__p7_1[] = {
 	5,
 	4,
 	6,
@@ -1013,7 +1013,7 @@ static long _vq_quantlist__16u1__p7_1[] 
 	10,
 };
 
-static long _vq_lengthlist__16u1__p7_1[] = {
+static const long _vq_lengthlist__16u1__p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 5, 7, 7,
 	 8, 8, 8, 8, 8, 8, 4, 5, 6, 7, 7, 8, 8, 8, 8, 8,
 	 8, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8,
@@ -1024,24 +1024,24 @@ static long _vq_lengthlist__16u1__p7_1[]
 	 8, 9, 9,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__16u1__p7_1[] = {
+static const float _vq_quantthresh__16u1__p7_1[] = {
 	-4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
 	3.5, 4.5, 
 };
 
-static long _vq_quantmap__16u1__p7_1[] = {
+static const long _vq_quantmap__16u1__p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p7_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p7_1 = {
 	_vq_quantthresh__16u1__p7_1,
 	_vq_quantmap__16u1__p7_1,
 	11,
 	11
 };
 
-static static_codebook _16u1__p7_1 = {
+static const static_codebook _16u1__p7_1 = {
 	2, 121,
 	_vq_lengthlist__16u1__p7_1,
 	1, -531365888, 1611661312, 4, 0,
@@ -1052,7 +1052,7 @@ static static_codebook _16u1__p7_1 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p8_0[] = {
+static const long _vq_quantlist__16u1__p8_0[] = {
 	5,
 	4,
 	6,
@@ -1066,7 +1066,7 @@ static long _vq_quantlist__16u1__p8_0[] 
 	10,
 };
 
-static long _vq_lengthlist__16u1__p8_0[] = {
+static const long _vq_lengthlist__16u1__p8_0[] = {
 	 1, 4, 4, 5, 5, 8, 8,10,10,12,12, 4, 7, 7, 8, 8,
 	 9, 9,12,11,14,13, 4, 7, 7, 7, 8, 9,10,11,11,13,
 	12, 5, 8, 8, 9, 9,11,11,12,13,15,14, 5, 7, 8, 9,
@@ -1077,24 +1077,24 @@ static long _vq_lengthlist__16u1__p8_0[]
 	13,14,14,15,15,16,16,15,16,
 };
 
-static float _vq_quantthresh__16u1__p8_0[] = {
+static const float _vq_quantthresh__16u1__p8_0[] = {
 	-49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 27.5, 
 	38.5, 49.5, 
 };
 
-static long _vq_quantmap__16u1__p8_0[] = {
+static const long _vq_quantmap__16u1__p8_0[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p8_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p8_0 = {
 	_vq_quantthresh__16u1__p8_0,
 	_vq_quantmap__16u1__p8_0,
 	11,
 	11
 };
 
-static static_codebook _16u1__p8_0 = {
+static const static_codebook _16u1__p8_0 = {
 	2, 121,
 	_vq_lengthlist__16u1__p8_0,
 	1, -524582912, 1618345984, 4, 0,
@@ -1105,7 +1105,7 @@ static static_codebook _16u1__p8_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p8_1[] = {
+static const long _vq_quantlist__16u1__p8_1[] = {
 	5,
 	4,
 	6,
@@ -1119,7 +1119,7 @@ static long _vq_quantlist__16u1__p8_1[] 
 	10,
 };
 
-static long _vq_lengthlist__16u1__p8_1[] = {
+static const long _vq_lengthlist__16u1__p8_1[] = {
 	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7,
 	 8, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8,
 	 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7,
@@ -1130,24 +1130,24 @@ static long _vq_lengthlist__16u1__p8_1[]
 	 8, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__16u1__p8_1[] = {
+static const float _vq_quantthresh__16u1__p8_1[] = {
 	-4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
 	3.5, 4.5, 
 };
 
-static long _vq_quantmap__16u1__p8_1[] = {
+static const long _vq_quantmap__16u1__p8_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p8_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p8_1 = {
 	_vq_quantthresh__16u1__p8_1,
 	_vq_quantmap__16u1__p8_1,
 	11,
 	11
 };
 
-static static_codebook _16u1__p8_1 = {
+static const static_codebook _16u1__p8_1 = {
 	2, 121,
 	_vq_lengthlist__16u1__p8_1,
 	1, -531365888, 1611661312, 4, 0,
@@ -1158,7 +1158,7 @@ static static_codebook _16u1__p8_1 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p9_0[] = {
+static const long _vq_quantlist__16u1__p9_0[] = {
 	7,
 	6,
 	8,
@@ -1176,7 +1176,7 @@ static long _vq_quantlist__16u1__p9_0[] 
 	14,
 };
 
-static long _vq_lengthlist__16u1__p9_0[] = {
+static const long _vq_lengthlist__16u1__p9_0[] = {
 	 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
@@ -1194,24 +1194,24 @@ static long _vq_lengthlist__16u1__p9_0[]
 	 8,
 };
 
-static float _vq_quantthresh__16u1__p9_0[] = {
+static const float _vq_quantthresh__16u1__p9_0[] = {
 	-1657.5, -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 
 	382.5, 637.5, 892.5, 1147.5, 1402.5, 1657.5, 
 };
 
-static long _vq_quantmap__16u1__p9_0[] = {
+static const long _vq_quantmap__16u1__p9_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p9_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p9_0 = {
 	_vq_quantthresh__16u1__p9_0,
 	_vq_quantmap__16u1__p9_0,
 	15,
 	15
 };
 
-static static_codebook _16u1__p9_0 = {
+static const static_codebook _16u1__p9_0 = {
 	2, 225,
 	_vq_lengthlist__16u1__p9_0,
 	1, -514071552, 1627381760, 4, 0,
@@ -1222,7 +1222,7 @@ static static_codebook _16u1__p9_0 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p9_1[] = {
+static const long _vq_quantlist__16u1__p9_1[] = {
 	7,
 	6,
 	8,
@@ -1240,7 +1240,7 @@ static long _vq_quantlist__16u1__p9_1[] 
 	14,
 };
 
-static long _vq_lengthlist__16u1__p9_1[] = {
+static const long _vq_lengthlist__16u1__p9_1[] = {
 	 1, 6, 5, 9, 9,10,10, 6, 7, 9, 9,10,10,10,10, 5,
 	10, 8,10, 8,10,10, 8, 8,10, 9,10,10,10,10, 5, 8,
 	 9,10,10,10,10, 8,10,10,10,10,10,10,10, 9,10,10,
@@ -1258,24 +1258,24 @@ static long _vq_lengthlist__16u1__p9_1[]
 	 9,
 };
 
-static float _vq_quantthresh__16u1__p9_1[] = {
+static const float _vq_quantthresh__16u1__p9_1[] = {
 	-110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 
 	25.5, 42.5, 59.5, 76.5, 93.5, 110.5, 
 };
 
-static long _vq_quantmap__16u1__p9_1[] = {
+static const long _vq_quantmap__16u1__p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p9_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p9_1 = {
 	_vq_quantthresh__16u1__p9_1,
 	_vq_quantmap__16u1__p9_1,
 	15,
 	15
 };
 
-static static_codebook _16u1__p9_1 = {
+static const static_codebook _16u1__p9_1 = {
 	2, 225,
 	_vq_lengthlist__16u1__p9_1,
 	1, -522338304, 1620115456, 4, 0,
@@ -1286,7 +1286,7 @@ static static_codebook _16u1__p9_1 = {
 	0
 };
 
-static long _vq_quantlist__16u1__p9_2[] = {
+static const long _vq_quantlist__16u1__p9_2[] = {
 	8,
 	7,
 	9,
@@ -1306,7 +1306,7 @@ static long _vq_quantlist__16u1__p9_2[] 
 	16,
 };
 
-static long _vq_lengthlist__16u1__p9_2[] = {
+static const long _vq_lengthlist__16u1__p9_2[] = {
 	 1, 6, 6, 7, 8, 8,11,10, 9, 9,11, 9,10, 9,11,11,
 	 9, 6, 7, 6,11, 8,11, 9,10,10,11, 9,11,10,10,10,
 	11, 9, 5, 7, 7, 8, 8,10,11, 8, 8,11, 9, 9,10,11,
@@ -1328,25 +1328,25 @@ static long _vq_lengthlist__16u1__p9_2[]
 	10,
 };
 
-static float _vq_quantthresh__16u1__p9_2[] = {
+static const float _vq_quantthresh__16u1__p9_2[] = {
 	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
 	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
 };
 
-static long _vq_quantmap__16u1__p9_2[] = {
+static const long _vq_quantmap__16u1__p9_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u1__p9_2 = {
+static const encode_aux_threshmatch _vq_auxt__16u1__p9_2 = {
 	_vq_quantthresh__16u1__p9_2,
 	_vq_quantmap__16u1__p9_2,
 	17,
 	17
 };
 
-static static_codebook _16u1__p9_2 = {
+static const static_codebook _16u1__p9_2 = {
 	2, 289,
 	_vq_lengthlist__16u1__p9_2,
 	1, -529530880, 1611661312, 5, 0,
@@ -1357,7 +1357,7 @@ static static_codebook _16u1__p9_2 = {
 	0
 };
 
-static long _huff_lengthlist__16u1__short[] = {
+static const long _huff_lengthlist__16u1__short[] = {
 	 5, 7,10, 9,11,10,15,11,13,16, 6, 4, 6, 6, 7, 7,
 	10, 9,12,16,10, 6, 5, 6, 6, 7,10,11,16,16, 9, 6,
 	 7, 6, 7, 7,10, 8,14,16,11, 6, 5, 4, 5, 6, 8, 9,
@@ -1367,7 +1367,7 @@ static long _huff_lengthlist__16u1__shor
 	16,16,16,16,
 };
 
-static static_codebook _huff_book__16u1__short = {
+static const static_codebook _huff_book__16u1__short = {
 	2, 100,
 	_huff_lengthlist__16u1__short,
 	0, 0, 0, 0, 0,
@@ -1378,7 +1378,7 @@ static static_codebook _huff_book__16u1_
 	0
 };
 
-static long _huff_lengthlist__16u2__long[] = {
+static const long _huff_lengthlist__16u2__long[] = {
 	 5, 7,10,10,10,11,11,13,18,19, 6, 5, 5, 6, 7, 8,
 	 9,12,19,19, 8, 5, 4, 4, 6, 7, 9,13,19,19, 8, 5,
 	 4, 4, 5, 6, 8,12,17,19, 7, 5, 5, 4, 4, 5, 7,12,
@@ -1388,7 +1388,7 @@ static long _huff_lengthlist__16u2__long
 	13,14,18,18,
 };
 
-static static_codebook _huff_book__16u2__long = {
+static const static_codebook _huff_book__16u2__long = {
 	2, 100,
 	_huff_lengthlist__16u2__long,
 	0, 0, 0, 0, 0,
@@ -1399,7 +1399,7 @@ static static_codebook _huff_book__16u2_
 	0
 };
 
-static long _huff_lengthlist__16u2__short[] = {
+static const long _huff_lengthlist__16u2__short[] = {
 	 8,11,12,12,14,15,16,16,16,16, 9, 7, 7, 8, 9,11,
 	13,14,16,16,13, 7, 6, 6, 7, 9,12,13,15,16,15, 7,
 	 6, 5, 4, 6,10,11,14,16,12, 8, 7, 4, 2, 4, 7,10,
@@ -1409,7 +1409,7 @@ static long _huff_lengthlist__16u2__shor
 	16,16,16,16,
 };
 
-static static_codebook _huff_book__16u2__short = {
+static const static_codebook _huff_book__16u2__short = {
 	2, 100,
 	_huff_lengthlist__16u2__short,
 	0, 0, 0, 0, 0,
@@ -1420,13 +1420,13 @@ static static_codebook _huff_book__16u2_
 	0
 };
 
-static long _vq_quantlist__16u2_p1_0[] = {
+static const long _vq_quantlist__16u2_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u2_p1_0[] = {
+static const long _vq_lengthlist__16u2_p1_0[] = {
 	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
 	 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8, 9,
 	 9, 7, 9, 9, 7, 9, 9, 9,10,10, 9,10,10, 7, 9, 9,
@@ -1435,22 +1435,22 @@ static long _vq_lengthlist__16u2_p1_0[] 
 	10,
 };
 
-static float _vq_quantthresh__16u2_p1_0[] = {
+static const float _vq_quantthresh__16u2_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16u2_p1_0[] = {
+static const long _vq_quantmap__16u2_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p1_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p1_0 = {
 	_vq_quantthresh__16u2_p1_0,
 	_vq_quantmap__16u2_p1_0,
 	3,
 	3
 };
 
-static static_codebook _16u2_p1_0 = {
+static const static_codebook _16u2_p1_0 = {
 	4, 81,
 	_vq_lengthlist__16u2_p1_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -1461,7 +1461,7 @@ static static_codebook _16u2_p1_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p2_0[] = {
+static const long _vq_quantlist__16u2_p2_0[] = {
 	2,
 	1,
 	3,
@@ -1469,7 +1469,7 @@ static long _vq_quantlist__16u2_p2_0[] =
 	4,
 };
 
-static long _vq_lengthlist__16u2_p2_0[] = {
+static const long _vq_lengthlist__16u2_p2_0[] = {
 	 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
 	10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10,
@@ -1512,22 +1512,22 @@ static long _vq_lengthlist__16u2_p2_0[] 
 	13,
 };
 
-static float _vq_quantthresh__16u2_p2_0[] = {
+static const float _vq_quantthresh__16u2_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u2_p2_0[] = {
+static const long _vq_quantmap__16u2_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p2_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p2_0 = {
 	_vq_quantthresh__16u2_p2_0,
 	_vq_quantmap__16u2_p2_0,
 	5,
 	5
 };
 
-static static_codebook _16u2_p2_0 = {
+static const static_codebook _16u2_p2_0 = {
 	4, 625,
 	_vq_lengthlist__16u2_p2_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -1538,7 +1538,7 @@ static static_codebook _16u2_p2_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p3_0[] = {
+static const long _vq_quantlist__16u2_p3_0[] = {
 	4,
 	3,
 	5,
@@ -1550,7 +1550,7 @@ static long _vq_quantlist__16u2_p3_0[] =
 	8,
 };
 
-static long _vq_lengthlist__16u2_p3_0[] = {
+static const long _vq_lengthlist__16u2_p3_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
 	 9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7,
 	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7,
@@ -1559,23 +1559,23 @@ static long _vq_lengthlist__16u2_p3_0[] 
 	11,
 };
 
-static float _vq_quantthresh__16u2_p3_0[] = {
+static const float _vq_quantthresh__16u2_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16u2_p3_0[] = {
+static const long _vq_quantmap__16u2_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p3_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p3_0 = {
 	_vq_quantthresh__16u2_p3_0,
 	_vq_quantmap__16u2_p3_0,
 	9,
 	9
 };
 
-static static_codebook _16u2_p3_0 = {
+static const static_codebook _16u2_p3_0 = {
 	2, 81,
 	_vq_lengthlist__16u2_p3_0,
 	1, -531628032, 1611661312, 4, 0,
@@ -1586,7 +1586,7 @@ static static_codebook _16u2_p3_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p4_0[] = {
+static const long _vq_quantlist__16u2_p4_0[] = {
 	8,
 	7,
 	9,
@@ -1606,7 +1606,7 @@ static long _vq_quantlist__16u2_p4_0[] =
 	16,
 };
 
-static long _vq_lengthlist__16u2_p4_0[] = {
+static const long _vq_lengthlist__16u2_p4_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11,
 	11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -1628,25 +1628,25 @@ static long _vq_lengthlist__16u2_p4_0[] 
 	14,
 };
 
-static float _vq_quantthresh__16u2_p4_0[] = {
+static const float _vq_quantthresh__16u2_p4_0[] = {
 	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
 	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
 };
 
-static long _vq_quantmap__16u2_p4_0[] = {
+static const long _vq_quantmap__16u2_p4_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p4_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p4_0 = {
 	_vq_quantthresh__16u2_p4_0,
 	_vq_quantmap__16u2_p4_0,
 	17,
 	17
 };
 
-static static_codebook _16u2_p4_0 = {
+static const static_codebook _16u2_p4_0 = {
 	2, 289,
 	_vq_lengthlist__16u2_p4_0,
 	1, -529530880, 1611661312, 5, 0,
@@ -1657,13 +1657,13 @@ static static_codebook _16u2_p4_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p5_0[] = {
+static const long _vq_quantlist__16u2_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16u2_p5_0[] = {
+static const long _vq_lengthlist__16u2_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10, 9, 7,
 	10, 9, 5, 8, 9, 7, 9,10, 7, 9,10, 4, 9, 9, 9,11,
 	11, 8,11,11, 7,11,11,10,10,13,10,14,13, 7,11,11,
@@ -1672,22 +1672,22 @@ static long _vq_lengthlist__16u2_p5_0[] 
 	10,
 };
 
-static float _vq_quantthresh__16u2_p5_0[] = {
+static const float _vq_quantthresh__16u2_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__16u2_p5_0[] = {
+static const long _vq_quantmap__16u2_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p5_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p5_0 = {
 	_vq_quantthresh__16u2_p5_0,
 	_vq_quantmap__16u2_p5_0,
 	3,
 	3
 };
 
-static static_codebook _16u2_p5_0 = {
+static const static_codebook _16u2_p5_0 = {
 	4, 81,
 	_vq_lengthlist__16u2_p5_0,
 	1, -529137664, 1618345984, 2, 0,
@@ -1698,7 +1698,7 @@ static static_codebook _16u2_p5_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p5_1[] = {
+static const long _vq_quantlist__16u2_p5_1[] = {
 	5,
 	4,
 	6,
@@ -1712,7 +1712,7 @@ static long _vq_quantlist__16u2_p5_1[] =
 	10,
 };
 
-static long _vq_lengthlist__16u2_p5_1[] = {
+static const long _vq_lengthlist__16u2_p5_1[] = {
 	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 7, 7,
 	 7, 7, 8, 8, 8, 8, 5, 5, 6, 7, 7, 7, 7, 8, 8, 8,
 	 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7,
@@ -1723,24 +1723,24 @@ static long _vq_lengthlist__16u2_p5_1[] 
 	 8, 8, 8, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__16u2_p5_1[] = {
+static const float _vq_quantthresh__16u2_p5_1[] = {
 	-4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
 	3.5, 4.5, 
 };
 
-static long _vq_quantmap__16u2_p5_1[] = {
+static const long _vq_quantmap__16u2_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p5_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p5_1 = {
 	_vq_quantthresh__16u2_p5_1,
 	_vq_quantmap__16u2_p5_1,
 	11,
 	11
 };
 
-static static_codebook _16u2_p5_1 = {
+static const static_codebook _16u2_p5_1 = {
 	2, 121,
 	_vq_lengthlist__16u2_p5_1,
 	1, -531365888, 1611661312, 4, 0,
@@ -1751,7 +1751,7 @@ static static_codebook _16u2_p5_1 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p6_0[] = {
+static const long _vq_quantlist__16u2_p6_0[] = {
 	6,
 	5,
 	7,
@@ -1767,7 +1767,7 @@ static long _vq_quantlist__16u2_p6_0[] =
 	12,
 };
 
-static long _vq_lengthlist__16u2_p6_0[] = {
+static const long _vq_lengthlist__16u2_p6_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6,
 	 8, 8, 9, 9, 9, 9,10,10,12,11, 4, 6, 6, 8, 8, 9,
 	 9, 9, 9,10,10,11,12, 7, 8, 8, 9, 9,10,10,10,10,
@@ -1781,24 +1781,24 @@ static long _vq_lengthlist__16u2_p6_0[] 
 	12,13,13,14,14,14,14,15,15,
 };
 
-static float _vq_quantthresh__16u2_p6_0[] = {
+static const float _vq_quantthresh__16u2_p6_0[] = {
 	-27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 
 	12.5, 17.5, 22.5, 27.5, 
 };
 
-static long _vq_quantmap__16u2_p6_0[] = {
+static const long _vq_quantmap__16u2_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p6_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p6_0 = {
 	_vq_quantthresh__16u2_p6_0,
 	_vq_quantmap__16u2_p6_0,
 	13,
 	13
 };
 
-static static_codebook _16u2_p6_0 = {
+static const static_codebook _16u2_p6_0 = {
 	2, 169,
 	_vq_lengthlist__16u2_p6_0,
 	1, -526516224, 1616117760, 4, 0,
@@ -1809,7 +1809,7 @@ static static_codebook _16u2_p6_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p6_1[] = {
+static const long _vq_quantlist__16u2_p6_1[] = {
 	2,
 	1,
 	3,
@@ -1817,27 +1817,27 @@ static long _vq_quantlist__16u2_p6_1[] =
 	4,
 };
 
-static long _vq_lengthlist__16u2_p6_1[] = {
+static const long _vq_lengthlist__16u2_p6_1[] = {
 	 2, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 	 5, 5, 6, 6, 5, 5, 5, 6, 6,
 };
 
-static float _vq_quantthresh__16u2_p6_1[] = {
+static const float _vq_quantthresh__16u2_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16u2_p6_1[] = {
+static const long _vq_quantmap__16u2_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p6_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p6_1 = {
 	_vq_quantthresh__16u2_p6_1,
 	_vq_quantmap__16u2_p6_1,
 	5,
 	5
 };
 
-static static_codebook _16u2_p6_1 = {
+static const static_codebook _16u2_p6_1 = {
 	2, 25,
 	_vq_lengthlist__16u2_p6_1,
 	1, -533725184, 1611661312, 3, 0,
@@ -1848,7 +1848,7 @@ static static_codebook _16u2_p6_1 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p7_0[] = {
+static const long _vq_quantlist__16u2_p7_0[] = {
 	6,
 	5,
 	7,
@@ -1864,7 +1864,7 @@ static long _vq_quantlist__16u2_p7_0[] =
 	12,
 };
 
-static long _vq_lengthlist__16u2_p7_0[] = {
+static const long _vq_lengthlist__16u2_p7_0[] = {
 	 1, 4, 4, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 6,
 	 9, 9, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 8, 9, 9,
 	 9, 9, 9,10,11,12,11, 7, 8, 9,10,10,10,10,11,10,
@@ -1878,24 +1878,24 @@ static long _vq_lengthlist__16u2_p7_0[] 
 	12,13,13,13,14,14,14,15,14,
 };
 
-static float _vq_quantthresh__16u2_p7_0[] = {
+static const float _vq_quantthresh__16u2_p7_0[] = {
 	-60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 
 	27.5, 38.5, 49.5, 60.5, 
 };
 
-static long _vq_quantmap__16u2_p7_0[] = {
+static const long _vq_quantmap__16u2_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p7_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p7_0 = {
 	_vq_quantthresh__16u2_p7_0,
 	_vq_quantmap__16u2_p7_0,
 	13,
 	13
 };
 
-static static_codebook _16u2_p7_0 = {
+static const static_codebook _16u2_p7_0 = {
 	2, 169,
 	_vq_lengthlist__16u2_p7_0,
 	1, -523206656, 1618345984, 4, 0,
@@ -1906,7 +1906,7 @@ static static_codebook _16u2_p7_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p7_1[] = {
+static const long _vq_quantlist__16u2_p7_1[] = {
 	5,
 	4,
 	6,
@@ -1920,7 +1920,7 @@ static long _vq_quantlist__16u2_p7_1[] =
 	10,
 };
 
-static long _vq_lengthlist__16u2_p7_1[] = {
+static const long _vq_lengthlist__16u2_p7_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7,
 	 7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8,
 	 8, 6, 6, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 7, 7, 7,
@@ -1931,24 +1931,24 @@ static long _vq_lengthlist__16u2_p7_1[] 
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__16u2_p7_1[] = {
+static const float _vq_quantthresh__16u2_p7_1[] = {
 	-4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
 	3.5, 4.5, 
 };
 
-static long _vq_quantmap__16u2_p7_1[] = {
+static const long _vq_quantmap__16u2_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p7_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p7_1 = {
 	_vq_quantthresh__16u2_p7_1,
 	_vq_quantmap__16u2_p7_1,
 	11,
 	11
 };
 
-static static_codebook _16u2_p7_1 = {
+static const static_codebook _16u2_p7_1 = {
 	2, 121,
 	_vq_lengthlist__16u2_p7_1,
 	1, -531365888, 1611661312, 4, 0,
@@ -1959,7 +1959,7 @@ static static_codebook _16u2_p7_1 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p8_0[] = {
+static const long _vq_quantlist__16u2_p8_0[] = {
 	7,
 	6,
 	8,
@@ -1977,7 +1977,7 @@ static long _vq_quantlist__16u2_p8_0[] =
 	14,
 };
 
-static long _vq_lengthlist__16u2_p8_0[] = {
+static const long _vq_lengthlist__16u2_p8_0[] = {
 	 1, 5, 5, 7, 7, 8, 8, 7, 7, 8, 8,10, 9,11,11, 4,
 	 6, 6, 8, 8,10, 9, 9, 8, 9, 9,10,10,12,14, 4, 6,
 	 7, 8, 9, 9,10, 9, 8, 9, 9,10,12,12,11, 7, 8, 8,
@@ -1995,24 +1995,24 @@ static long _vq_lengthlist__16u2_p8_0[] 
 	14,
 };
 
-static float _vq_quantthresh__16u2_p8_0[] = {
+static const float _vq_quantthresh__16u2_p8_0[] = {
 	-136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, 
 	31.5, 52.5, 73.5, 94.5, 115.5, 136.5, 
 };
 
-static long _vq_quantmap__16u2_p8_0[] = {
+static const long _vq_quantmap__16u2_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p8_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p8_0 = {
 	_vq_quantthresh__16u2_p8_0,
 	_vq_quantmap__16u2_p8_0,
 	15,
 	15
 };
 
-static static_codebook _16u2_p8_0 = {
+static const static_codebook _16u2_p8_0 = {
 	2, 225,
 	_vq_lengthlist__16u2_p8_0,
 	1, -520986624, 1620377600, 4, 0,
@@ -2023,7 +2023,7 @@ static static_codebook _16u2_p8_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p8_1[] = {
+static const long _vq_quantlist__16u2_p8_1[] = {
 	10,
 	9,
 	11,
@@ -2047,7 +2047,7 @@ static long _vq_quantlist__16u2_p8_1[] =
 	20,
 };
 
-static long _vq_lengthlist__16u2_p8_1[] = {
+static const long _vq_lengthlist__16u2_p8_1[] = {
 	 2, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,10, 9, 9,
 	 9,10,10,10,10, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,
 	10, 9,10,10,10,10,10,10,11,10, 5, 6, 6, 7, 7, 8,
@@ -2078,26 +2078,26 @@ static long _vq_lengthlist__16u2_p8_1[] 
 	11,11,10,11,11,11,10,11,11,
 };
 
-static float _vq_quantthresh__16u2_p8_1[] = {
+static const float _vq_quantthresh__16u2_p8_1[] = {
 	-9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, 
 	-1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 
 	6.5, 7.5, 8.5, 9.5, 
 };
 
-static long _vq_quantmap__16u2_p8_1[] = {
+static const long _vq_quantmap__16u2_p8_1[] = {
 	   19,   17,   15,   13,   11,    9,    7,    5,
 	    3,    1,    0,    2,    4,    6,    8,   10,
 	   12,   14,   16,   18,   20,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p8_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p8_1 = {
 	_vq_quantthresh__16u2_p8_1,
 	_vq_quantmap__16u2_p8_1,
 	21,
 	21
 };
 
-static static_codebook _16u2_p8_1 = {
+static const static_codebook _16u2_p8_1 = {
 	2, 441,
 	_vq_lengthlist__16u2_p8_1,
 	1, -529268736, 1611661312, 5, 0,
@@ -2108,7 +2108,7 @@ static static_codebook _16u2_p8_1 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p9_0[] = {
+static const long _vq_quantlist__16u2_p9_0[] = {
 	5586,
 	4655,
 	6517,
@@ -2126,7 +2126,7 @@ static long _vq_quantlist__16u2_p9_0[] =
 	5651,
 };
 
-static long _vq_lengthlist__16u2_p9_0[] = {
+static const long _vq_lengthlist__16u2_p9_0[] = {
 	 1,10,10,10,10,10,10,10,10,10,10,10,10, 5, 4,10,
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
@@ -2144,24 +2144,24 @@ static long _vq_lengthlist__16u2_p9_0[] 
 	 5,
 };
 
-static float _vq_quantthresh__16u2_p9_0[] = {
+static const float _vq_quantthresh__16u2_p9_0[] = {
 	-5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -498, -32.5, 32.5, 
 	498, 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 
 };
 
-static long _vq_quantmap__16u2_p9_0[] = {
+static const long _vq_quantmap__16u2_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,   13,    0,
 	   14,    2,    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p9_0 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p9_0 = {
 	_vq_quantthresh__16u2_p9_0,
 	_vq_quantmap__16u2_p9_0,
 	15,
 	15
 };
 
-static static_codebook _16u2_p9_0 = {
+static const static_codebook _16u2_p9_0 = {
 	2, 225,
 	_vq_lengthlist__16u2_p9_0,
 	1, -510275072, 1611661312, 14, 0,
@@ -2172,7 +2172,7 @@ static static_codebook _16u2_p9_0 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p9_1[] = {
+static const long _vq_quantlist__16u2_p9_1[] = {
 	392,
 	343,
 	441,
@@ -2194,7 +2194,7 @@ static long _vq_quantlist__16u2_p9_1[] =
 	396,
 };
 
-static long _vq_lengthlist__16u2_p9_1[] = {
+static const long _vq_lengthlist__16u2_p9_1[] = {
 	 1,12,10,12,10,12,10,12,11,12,12,12,12,12,12,12,
 	12, 5, 5, 9,10,12,11,11,12,12,12,12,12,12,12,12,
 	12,12,12,12,10, 9, 9,11, 9,11,11,12,11,12,12,12,
@@ -2220,26 +2220,26 @@ static long _vq_lengthlist__16u2_p9_1[] 
 	11,11,11,11,11,11,11, 5, 4,
 };
 
-static float _vq_quantthresh__16u2_p9_1[] = {
+static const float _vq_quantthresh__16u2_p9_1[] = {
 	-367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, -26.5, 
 	-2, 2, 26.5, 73.5, 122.5, 171.5, 220.5, 269.5, 
 	318.5, 367.5, 
 };
 
-static long _vq_quantmap__16u2_p9_1[] = {
+static const long _vq_quantmap__16u2_p9_1[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	   17,    0,   18,    2,    4,    6,    8,   10,
 	   12,   14,   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p9_1 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p9_1 = {
 	_vq_quantthresh__16u2_p9_1,
 	_vq_quantmap__16u2_p9_1,
 	19,
 	19
 };
 
-static static_codebook _16u2_p9_1 = {
+static const static_codebook _16u2_p9_1 = {
 	2, 361,
 	_vq_lengthlist__16u2_p9_1,
 	1, -518488064, 1611661312, 10, 0,
@@ -2250,7 +2250,7 @@ static static_codebook _16u2_p9_1 = {
 	0
 };
 
-static long _vq_quantlist__16u2_p9_2[] = {
+static const long _vq_quantlist__16u2_p9_2[] = {
 	24,
 	23,
 	25,
@@ -2302,14 +2302,14 @@ static long _vq_quantlist__16u2_p9_2[] =
 	48,
 };
 
-static long _vq_lengthlist__16u2_p9_2[] = {
+static const long _vq_lengthlist__16u2_p9_2[] = {
 	 1, 3, 3, 4, 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 8, 8,
 	 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 9, 9, 8, 9, 9,
 	 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,12,12,10,
 	11,
 };
 
-static float _vq_quantthresh__16u2_p9_2[] = {
+static const float _vq_quantthresh__16u2_p9_2[] = {
 	-23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, 
 	-15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, 
 	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
@@ -2318,7 +2318,7 @@ static float _vq_quantthresh__16u2_p9_2[
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__16u2_p9_2[] = {
+static const long _vq_quantmap__16u2_p9_2[] = {
 	   47,   45,   43,   41,   39,   37,   35,   33,
 	   31,   29,   27,   25,   23,   21,   19,   17,
 	   15,   13,   11,    9,    7,    5,    3,    1,
@@ -2328,14 +2328,14 @@ static long _vq_quantmap__16u2_p9_2[] = 
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p9_2 = {
+static const encode_aux_threshmatch _vq_auxt__16u2_p9_2 = {
 	_vq_quantthresh__16u2_p9_2,
 	_vq_quantmap__16u2_p9_2,
 	49,
 	49
 };
 
-static static_codebook _16u2_p9_2 = {
+static const static_codebook _16u2_p9_2 = {
 	1, 49,
 	_vq_lengthlist__16u2_p9_2,
 	1, -526909440, 1611661312, 6, 0,
@@ -2346,13 +2346,13 @@ static static_codebook _16u2_p9_2 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p1_0[] = {
+static const long _vq_quantlist__8u0__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8u0__p1_0[] = {
+static const long _vq_lengthlist__8u0__p1_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7,
 	10,10, 5, 8, 8, 7,10,10, 8,10,10, 4, 9, 8, 8,11,
 	11, 8,11,11, 7,11,11,10,11,13,10,13,13, 7,11,11,
@@ -2361,22 +2361,22 @@ static long _vq_lengthlist__8u0__p1_0[] 
 	11,
 };
 
-static float _vq_quantthresh__8u0__p1_0[] = {
+static const float _vq_quantthresh__8u0__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8u0__p1_0[] = {
+static const long _vq_quantmap__8u0__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p1_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p1_0 = {
 	_vq_quantthresh__8u0__p1_0,
 	_vq_quantmap__8u0__p1_0,
 	3,
 	3
 };
 
-static static_codebook _8u0__p1_0 = {
+static const static_codebook _8u0__p1_0 = {
 	4, 81,
 	_vq_lengthlist__8u0__p1_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -2387,13 +2387,13 @@ static static_codebook _8u0__p1_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p2_0[] = {
+static const long _vq_quantlist__8u0__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8u0__p2_0[] = {
+static const long _vq_lengthlist__8u0__p2_0[] = {
 	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 6, 7, 8, 6,
 	 7, 8, 5, 7, 7, 6, 8, 8, 7, 9, 7, 5, 7, 7, 7, 9,
 	 9, 7, 8, 8, 6, 9, 8, 7, 7,10, 8,10,10, 6, 8, 8,
@@ -2402,22 +2402,22 @@ static long _vq_lengthlist__8u0__p2_0[] 
 	 8,
 };
 
-static float _vq_quantthresh__8u0__p2_0[] = {
+static const float _vq_quantthresh__8u0__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8u0__p2_0[] = {
+static const long _vq_quantmap__8u0__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p2_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p2_0 = {
 	_vq_quantthresh__8u0__p2_0,
 	_vq_quantmap__8u0__p2_0,
 	3,
 	3
 };
 
-static static_codebook _8u0__p2_0 = {
+static const static_codebook _8u0__p2_0 = {
 	4, 81,
 	_vq_lengthlist__8u0__p2_0,
 	1, -535822336, 1611661312, 2, 0,
@@ -2428,7 +2428,7 @@ static static_codebook _8u0__p2_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p3_0[] = {
+static const long _vq_quantlist__8u0__p3_0[] = {
 	2,
 	1,
 	3,
@@ -2436,7 +2436,7 @@ static long _vq_quantlist__8u0__p3_0[] =
 	4,
 };
 
-static long _vq_lengthlist__8u0__p3_0[] = {
+static const long _vq_lengthlist__8u0__p3_0[] = {
 	 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
 	10, 9,11,11, 8, 9, 9,11,11, 6, 8, 8,10,10, 8,10,
 	10,11,11, 8,10,10,11,11,10,11,11,12,12,10,11,11,
@@ -2479,22 +2479,22 @@ static long _vq_lengthlist__8u0__p3_0[] 
 	16,
 };
 
-static float _vq_quantthresh__8u0__p3_0[] = {
+static const float _vq_quantthresh__8u0__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u0__p3_0[] = {
+static const long _vq_quantmap__8u0__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p3_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p3_0 = {
 	_vq_quantthresh__8u0__p3_0,
 	_vq_quantmap__8u0__p3_0,
 	5,
 	5
 };
 
-static static_codebook _8u0__p3_0 = {
+static const static_codebook _8u0__p3_0 = {
 	4, 625,
 	_vq_lengthlist__8u0__p3_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -2505,7 +2505,7 @@ static static_codebook _8u0__p3_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p4_0[] = {
+static const long _vq_quantlist__8u0__p4_0[] = {
 	2,
 	1,
 	3,
@@ -2513,7 +2513,7 @@ static long _vq_quantlist__8u0__p4_0[] =
 	4,
 };
 
-static long _vq_lengthlist__8u0__p4_0[] = {
+static const long _vq_lengthlist__8u0__p4_0[] = {
 	 3, 5, 5, 8, 8, 5, 6, 7, 9, 9, 6, 7, 6, 9, 9, 9,
 	 9, 9,10,11, 9, 9, 9,11,10, 6, 7, 7,10,10, 7, 7,
 	 8,10,10, 7, 8, 8,10,10,10,10,10,10,11, 9,10,10,
@@ -2556,22 +2556,22 @@ static long _vq_lengthlist__8u0__p4_0[] 
 	12,
 };
 
-static float _vq_quantthresh__8u0__p4_0[] = {
+static const float _vq_quantthresh__8u0__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u0__p4_0[] = {
+static const long _vq_quantmap__8u0__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p4_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p4_0 = {
 	_vq_quantthresh__8u0__p4_0,
 	_vq_quantmap__8u0__p4_0,
 	5,
 	5
 };
 
-static static_codebook _8u0__p4_0 = {
+static const static_codebook _8u0__p4_0 = {
 	4, 625,
 	_vq_lengthlist__8u0__p4_0,
 	1, -533725184, 1611661312, 3, 0,
@@ -2582,7 +2582,7 @@ static static_codebook _8u0__p4_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p5_0[] = {
+static const long _vq_quantlist__8u0__p5_0[] = {
 	4,
 	3,
 	5,
@@ -2594,7 +2594,7 @@ static long _vq_quantlist__8u0__p5_0[] =
 	8,
 };
 
-static long _vq_lengthlist__8u0__p5_0[] = {
+static const long _vq_lengthlist__8u0__p5_0[] = {
 	 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 7, 8, 8,
 	10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 6, 8, 8, 9, 9,
 	 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8,
@@ -2603,23 +2603,23 @@ static long _vq_lengthlist__8u0__p5_0[] 
 	12,
 };
 
-static float _vq_quantthresh__8u0__p5_0[] = {
+static const float _vq_quantthresh__8u0__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8u0__p5_0[] = {
+static const long _vq_quantmap__8u0__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p5_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p5_0 = {
 	_vq_quantthresh__8u0__p5_0,
 	_vq_quantmap__8u0__p5_0,
 	9,
 	9
 };
 
-static static_codebook _8u0__p5_0 = {
+static const static_codebook _8u0__p5_0 = {
 	2, 81,
 	_vq_lengthlist__8u0__p5_0,
 	1, -531628032, 1611661312, 4, 0,
@@ -2630,7 +2630,7 @@ static static_codebook _8u0__p5_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p6_0[] = {
+static const long _vq_quantlist__8u0__p6_0[] = {
 	6,
 	5,
 	7,
@@ -2646,7 +2646,7 @@ static long _vq_quantlist__8u0__p6_0[] =
 	12,
 };
 
-static long _vq_lengthlist__8u0__p6_0[] = {
+static const long _vq_lengthlist__8u0__p6_0[] = {
 	 1, 4, 4, 7, 7, 9, 9,11,11,12,12,16,16, 3, 6, 6,
 	 9, 9,11,11,12,12,13,14,18,16, 3, 6, 7, 9, 9,11,
 	11,13,12,14,14,17,16, 7, 9, 9,11,11,12,12,14,14,
@@ -2660,24 +2660,24 @@ static long _vq_lengthlist__8u0__p6_0[] 
 	16, 0,15, 0,17, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__8u0__p6_0[] = {
+static const float _vq_quantthresh__8u0__p6_0[] = {
 	-27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 
 	12.5, 17.5, 22.5, 27.5, 
 };
 
-static long _vq_quantmap__8u0__p6_0[] = {
+static const long _vq_quantmap__8u0__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p6_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p6_0 = {
 	_vq_quantthresh__8u0__p6_0,
 	_vq_quantmap__8u0__p6_0,
 	13,
 	13
 };
 
-static static_codebook _8u0__p6_0 = {
+static const static_codebook _8u0__p6_0 = {
 	2, 169,
 	_vq_lengthlist__8u0__p6_0,
 	1, -526516224, 1616117760, 4, 0,
@@ -2688,7 +2688,7 @@ static static_codebook _8u0__p6_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p6_1[] = {
+static const long _vq_quantlist__8u0__p6_1[] = {
 	2,
 	1,
 	3,
@@ -2696,27 +2696,27 @@ static long _vq_quantlist__8u0__p6_1[] =
 	4,
 };
 
-static long _vq_lengthlist__8u0__p6_1[] = {
+static const long _vq_lengthlist__8u0__p6_1[] = {
 	 1, 4, 4, 6, 6, 4, 6, 5, 7, 7, 4, 5, 6, 7, 7, 6,
 	 7, 7, 7, 7, 6, 7, 7, 7, 7,
 };
 
-static float _vq_quantthresh__8u0__p6_1[] = {
+static const float _vq_quantthresh__8u0__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u0__p6_1[] = {
+static const long _vq_quantmap__8u0__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p6_1 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p6_1 = {
 	_vq_quantthresh__8u0__p6_1,
 	_vq_quantmap__8u0__p6_1,
 	5,
 	5
 };
 
-static static_codebook _8u0__p6_1 = {
+static const static_codebook _8u0__p6_1 = {
 	2, 25,
 	_vq_lengthlist__8u0__p6_1,
 	1, -533725184, 1611661312, 3, 0,
@@ -2727,13 +2727,13 @@ static static_codebook _8u0__p6_1 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p7_0[] = {
+static const long _vq_quantlist__8u0__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8u0__p7_0[] = {
+static const long _vq_lengthlist__8u0__p7_0[] = {
 	 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
@@ -2742,22 +2742,22 @@ static long _vq_lengthlist__8u0__p7_0[] 
 	 7,
 };
 
-static float _vq_quantthresh__8u0__p7_0[] = {
+static const float _vq_quantthresh__8u0__p7_0[] = {
 	-157.5, 157.5, 
 };
 
-static long _vq_quantmap__8u0__p7_0[] = {
+static const long _vq_quantmap__8u0__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p7_0 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p7_0 = {
 	_vq_quantthresh__8u0__p7_0,
 	_vq_quantmap__8u0__p7_0,
 	3,
 	3
 };
 
-static static_codebook _8u0__p7_0 = {
+static const static_codebook _8u0__p7_0 = {
 	4, 81,
 	_vq_lengthlist__8u0__p7_0,
 	1, -518803456, 1628680192, 2, 0,
@@ -2768,7 +2768,7 @@ static static_codebook _8u0__p7_0 = {
 	0
 };
 
-static long _vq_quantlist__8u0__p7_1[] = {
+static const long _vq_quantlist__8u0__p7_1[] = {
 	7,
 	6,
 	8,
@@ -2786,7 +2786,7 @@ static long _vq_quantlist__8u0__p7_1[] =
 	14,
 };
 
-static long _vq_lengthlist__8u0__p7_1[] = {
+static const long _vq_lengthlist__8u0__p7_1[] = {
 	 1, 5, 5, 5, 5,10,10,11,11,11,11,11,11,11,11, 5,
 	 7, 6, 8, 8, 9,10,11,11,11,11,11,11,11,11, 6, 6,
 	 7, 9, 7,11,10,11,11,11,11,11,11,11,11, 5, 6, 6,
@@ -2804,24 +2804,24 @@ static long _vq_lengthlist__8u0__p7_1[] 
 	10,
 };
 
-static float _vq_quantthresh__8u0__p7_1[] = {
+static const float _vq_quantthresh__8u0__p7_1[] = {
 	-136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, 
 	31.5, 52.5, 73.5, 94.5, 115.5, 136.5, 
 };
 
-static long _vq_quantmap__8u0__p7_1[] = {
+static const long _vq_quantmap__8u0__p7_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u0__p7_1 = {
+static const encode_aux_threshmatch _vq_auxt__8u0__p7_1 = {
 	_vq_quantthresh__8u0__p7_1,
 	_vq_quantmap__8u0__p7_1,
 	15,
 	15
 };
 
-sta