[xiph-commits] r15531 - in trunk/vorbis: lib lib/books/coupled lib/books/floor lib/books/uncoupled lib/modes vq

xiphmont at svn.xiph.org xiphmont at svn.xiph.org
Mon Nov 24 15:50:10 PST 2008


Author: xiphmont
Date: 2008-11-24 15:50:06 -0800 (Mon, 24 Nov 2008)
New Revision: 15531

Modified:
   trunk/vorbis/lib/backends.h
   trunk/vorbis/lib/books/coupled/res_books_stereo.h
   trunk/vorbis/lib/books/floor/floor_books.h
   trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h
   trunk/vorbis/lib/floor0.c
   trunk/vorbis/lib/floor1.c
   trunk/vorbis/lib/highlevel.h
   trunk/vorbis/lib/mapping0.c
   trunk/vorbis/lib/masking.h
   trunk/vorbis/lib/modes/floor_all.h
   trunk/vorbis/lib/modes/psych_11.h
   trunk/vorbis/lib/modes/psych_16.h
   trunk/vorbis/lib/modes/psych_44.h
   trunk/vorbis/lib/modes/psych_8.h
   trunk/vorbis/lib/modes/residue_16.h
   trunk/vorbis/lib/modes/residue_44.h
   trunk/vorbis/lib/modes/residue_44u.h
   trunk/vorbis/lib/modes/residue_8.h
   trunk/vorbis/lib/modes/setup_11.h
   trunk/vorbis/lib/modes/setup_16.h
   trunk/vorbis/lib/modes/setup_22.h
   trunk/vorbis/lib/modes/setup_32.h
   trunk/vorbis/lib/modes/setup_44.h
   trunk/vorbis/lib/modes/setup_44u.h
   trunk/vorbis/lib/modes/setup_8.h
   trunk/vorbis/lib/modes/setup_X.h
   trunk/vorbis/lib/registry.c
   trunk/vorbis/lib/registry.h
   trunk/vorbis/lib/res0.c
   trunk/vorbis/lib/vorbisenc.c
   trunk/vorbis/lib/window.c
   trunk/vorbis/vq/bookutil.c
   trunk/vorbis/vq/huffbuild.c
Log:
An attempt at a complete version of the patch submitted in #1291.  Also 
updated autogenerating utils (not tested) and tried to eliminate all 
resulting warnings.



Modified: trunk/vorbis/lib/backends.h
===================================================================
--- trunk/vorbis/lib/backends.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/backends.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -113,9 +113,8 @@
   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 *****************************************/

Modified: trunk/vorbis/lib/books/coupled/res_books_stereo.h
===================================================================
--- trunk/vorbis/lib/books/coupled/res_books_stereo.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/books/coupled/res_books_stereo.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -16,13 +16,13 @@
  ********************************************************************/
 
 #include "codebook.h"
-static long _vq_quantlist__16c0_s_p1_0[] = {
+static const long _vq_quantlist__16c0_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c0_s_p1_0[] = {
+static const long _vq_lengthlist__16c0_s_p1_0[] = {
 	 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -436,33 +436,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c0_s_p1_0[] = {
+static const float _vq_quantthresh__16c0_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16c0_s_p1_0[] = {
+static const long _vq_quantmap__16c0_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p1_0 = {
-	_vq_quantthresh__16c0_s_p1_0,
-	_vq_quantmap__16c0_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p1_0 = {
+	(float *)_vq_quantthresh__16c0_s_p1_0,
+	(long *)_vq_quantmap__16c0_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _16c0_s_p1_0 = {
+static const static_codebook _16c0_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__16c0_s_p1_0,
+	(long *)_vq_lengthlist__16c0_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16c0_s_p1_0,
+	(long *)_vq_quantlist__16c0_s_p1_0,
 	NULL,
-	&_vq_auxt__16c0_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p3_0[] = {
+static const long _vq_quantlist__16c0_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -470,7 +470,7 @@
 	4,
 };
 
-static long _vq_lengthlist__16c0_s_p3_0[] = {
+static const long _vq_lengthlist__16c0_s_p3_0[] = {
 	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 7, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -513,33 +513,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c0_s_p3_0[] = {
+static const float _vq_quantthresh__16c0_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16c0_s_p3_0[] = {
+static const long _vq_quantmap__16c0_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p3_0 = {
-	_vq_quantthresh__16c0_s_p3_0,
-	_vq_quantmap__16c0_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p3_0 = {
+	(float *)_vq_quantthresh__16c0_s_p3_0,
+	(long *)_vq_quantmap__16c0_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _16c0_s_p3_0 = {
+static const static_codebook _16c0_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__16c0_s_p3_0,
+	(long *)_vq_lengthlist__16c0_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16c0_s_p3_0,
+	(long *)_vq_quantlist__16c0_s_p3_0,
 	NULL,
-	&_vq_auxt__16c0_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p4_0[] = {
+static const long _vq_quantlist__16c0_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -551,7 +551,7 @@
 	8,
 };
 
-static long _vq_lengthlist__16c0_s_p4_0[] = {
+static const long _vq_lengthlist__16c0_s_p4_0[] = {
 	 1, 3, 2, 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -560,34 +560,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c0_s_p4_0[] = {
+static const float _vq_quantthresh__16c0_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16c0_s_p4_0[] = {
+static const long _vq_quantmap__16c0_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p4_0 = {
-	_vq_quantthresh__16c0_s_p4_0,
-	_vq_quantmap__16c0_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p4_0 = {
+	(float *)_vq_quantthresh__16c0_s_p4_0,
+	(long *)_vq_quantmap__16c0_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _16c0_s_p4_0 = {
+static const static_codebook _16c0_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__16c0_s_p4_0,
+	(long *)_vq_lengthlist__16c0_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16c0_s_p4_0,
+	(long *)_vq_quantlist__16c0_s_p4_0,
 	NULL,
-	&_vq_auxt__16c0_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p5_0[] = {
+static const long _vq_quantlist__16c0_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -599,7 +599,7 @@
 	8,
 };
 
-static long _vq_lengthlist__16c0_s_p5_0[] = {
+static const long _vq_lengthlist__16c0_s_p5_0[] = {
 	 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7,
 	 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7,
 	 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0,
@@ -608,34 +608,34 @@
 	10,
 };
 
-static float _vq_quantthresh__16c0_s_p5_0[] = {
+static const float _vq_quantthresh__16c0_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16c0_s_p5_0[] = {
+static const long _vq_quantmap__16c0_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p5_0 = {
-	_vq_quantthresh__16c0_s_p5_0,
-	_vq_quantmap__16c0_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p5_0 = {
+	(float *)_vq_quantthresh__16c0_s_p5_0,
+	(long *)_vq_quantmap__16c0_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _16c0_s_p5_0 = {
+static const static_codebook _16c0_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__16c0_s_p5_0,
+	(long *)_vq_lengthlist__16c0_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16c0_s_p5_0,
+	(long *)_vq_quantlist__16c0_s_p5_0,
 	NULL,
-	&_vq_auxt__16c0_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p6_0[] = {
+static const long _vq_quantlist__16c0_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -655,7 +655,7 @@
 	16,
 };
 
-static long _vq_lengthlist__16c0_s_p6_0[] = {
+static const long _vq_lengthlist__16c0_s_p6_0[] = {
 	 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11,
 	11,11, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -677,42 +677,42 @@
 	14,
 };
 
-static float _vq_quantthresh__16c0_s_p6_0[] = {
+static const float _vq_quantthresh__16c0_s_p6_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__16c0_s_p6_0[] = {
+static const long _vq_quantmap__16c0_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p6_0 = {
-	_vq_quantthresh__16c0_s_p6_0,
-	_vq_quantmap__16c0_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p6_0 = {
+	(float *)_vq_quantthresh__16c0_s_p6_0,
+	(long *)_vq_quantmap__16c0_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _16c0_s_p6_0 = {
+static const static_codebook _16c0_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__16c0_s_p6_0,
+	(long *)_vq_lengthlist__16c0_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__16c0_s_p6_0,
+	(long *)_vq_quantlist__16c0_s_p6_0,
 	NULL,
-	&_vq_auxt__16c0_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p7_0[] = {
+static const long _vq_quantlist__16c0_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c0_s_p7_0[] = {
+static const long _vq_lengthlist__16c0_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,11,10,10,11,
 	11,10, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11,
 	11,11,11,10, 6, 9, 9,11,12,12,11, 9, 9, 6, 9,10,
@@ -721,33 +721,33 @@
 	13,
 };
 
-static float _vq_quantthresh__16c0_s_p7_0[] = {
+static const float _vq_quantthresh__16c0_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__16c0_s_p7_0[] = {
+static const long _vq_quantmap__16c0_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p7_0 = {
-	_vq_quantthresh__16c0_s_p7_0,
-	_vq_quantmap__16c0_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p7_0 = {
+	(float *)_vq_quantthresh__16c0_s_p7_0,
+	(long *)_vq_quantmap__16c0_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _16c0_s_p7_0 = {
+static const static_codebook _16c0_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__16c0_s_p7_0,
+	(long *)_vq_lengthlist__16c0_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__16c0_s_p7_0,
+	(long *)_vq_quantlist__16c0_s_p7_0,
 	NULL,
-	&_vq_auxt__16c0_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p7_1[] = {
+static const long _vq_quantlist__16c0_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -761,7 +761,7 @@
 	10,
 };
 
-static long _vq_lengthlist__16c0_s_p7_1[] = {
+static const long _vq_lengthlist__16c0_s_p7_1[] = {
 	 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7,
 	 8, 8, 8, 9, 9, 9,10,10,10, 6, 7, 8, 8, 8, 8, 9,
 	 8,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 7,
@@ -772,35 +772,35 @@
 	11,11,11, 9, 9, 9, 9,10,10,
 };
 
-static float _vq_quantthresh__16c0_s_p7_1[] = {
+static const float _vq_quantthresh__16c0_s_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__16c0_s_p7_1[] = {
+static const long _vq_quantmap__16c0_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p7_1 = {
-	_vq_quantthresh__16c0_s_p7_1,
-	_vq_quantmap__16c0_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p7_1 = {
+	(float *)_vq_quantthresh__16c0_s_p7_1,
+	(long *)_vq_quantmap__16c0_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _16c0_s_p7_1 = {
+static const static_codebook _16c0_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__16c0_s_p7_1,
+	(long *)_vq_lengthlist__16c0_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16c0_s_p7_1,
+	(long *)_vq_quantlist__16c0_s_p7_1,
 	NULL,
-	&_vq_auxt__16c0_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p8_0[] = {
+static const long _vq_quantlist__16c0_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -816,7 +816,7 @@
 	12,
 };
 
-static long _vq_lengthlist__16c0_s_p8_0[] = {
+static const long _vq_lengthlist__16c0_s_p8_0[] = {
 	 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8,10,10, 6, 5, 6,
 	 8, 8, 8, 8, 8, 8, 8, 9,10,10, 7, 6, 6, 8, 8, 8,
 	 8, 8, 8, 8, 8,10,10, 0, 8, 8, 8, 8, 9, 8, 9, 9,
@@ -830,35 +830,35 @@
 	 0,12,13,13,12,13,14,14,14,
 };
 
-static float _vq_quantthresh__16c0_s_p8_0[] = {
+static const float _vq_quantthresh__16c0_s_p8_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__16c0_s_p8_0[] = {
+static const long _vq_quantmap__16c0_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p8_0 = {
-	_vq_quantthresh__16c0_s_p8_0,
-	_vq_quantmap__16c0_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p8_0 = {
+	(float *)_vq_quantthresh__16c0_s_p8_0,
+	(long *)_vq_quantmap__16c0_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _16c0_s_p8_0 = {
+static const static_codebook _16c0_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__16c0_s_p8_0,
+	(long *)_vq_lengthlist__16c0_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__16c0_s_p8_0,
+	(long *)_vq_quantlist__16c0_s_p8_0,
 	NULL,
-	&_vq_auxt__16c0_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p8_1[] = {
+static const long _vq_quantlist__16c0_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -866,44 +866,44 @@
 	4,
 };
 
-static long _vq_lengthlist__16c0_s_p8_1[] = {
+static const long _vq_lengthlist__16c0_s_p8_1[] = {
 	 1, 4, 3, 5, 5, 7, 7, 7, 6, 6, 7, 7, 7, 5, 5, 7,
 	 7, 7, 6, 6, 7, 7, 7, 6, 6,
 };
 
-static float _vq_quantthresh__16c0_s_p8_1[] = {
+static const float _vq_quantthresh__16c0_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16c0_s_p8_1[] = {
+static const long _vq_quantmap__16c0_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p8_1 = {
-	_vq_quantthresh__16c0_s_p8_1,
-	_vq_quantmap__16c0_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p8_1 = {
+	(float *)_vq_quantthresh__16c0_s_p8_1,
+	(long *)_vq_quantmap__16c0_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _16c0_s_p8_1 = {
+static const static_codebook _16c0_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__16c0_s_p8_1,
+	(long *)_vq_lengthlist__16c0_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16c0_s_p8_1,
+	(long *)_vq_quantlist__16c0_s_p8_1,
 	NULL,
-	&_vq_auxt__16c0_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p9_0[] = {
+static const long _vq_quantlist__16c0_s_p9_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c0_s_p9_0[] = {
+static const long _vq_lengthlist__16c0_s_p9_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,
@@ -912,33 +912,33 @@
 	 7,
 };
 
-static float _vq_quantthresh__16c0_s_p9_0[] = {
+static const float _vq_quantthresh__16c0_s_p9_0[] = {
 	-157.5, 157.5, 
 };
 
-static long _vq_quantmap__16c0_s_p9_0[] = {
+static const long _vq_quantmap__16c0_s_p9_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p9_0 = {
-	_vq_quantthresh__16c0_s_p9_0,
-	_vq_quantmap__16c0_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p9_0 = {
+	(float *)_vq_quantthresh__16c0_s_p9_0,
+	(long *)_vq_quantmap__16c0_s_p9_0,
 	3,
 	3
 };
 
-static static_codebook _16c0_s_p9_0 = {
+static const static_codebook _16c0_s_p9_0 = {
 	4, 81,
-	_vq_lengthlist__16c0_s_p9_0,
+	(long *)_vq_lengthlist__16c0_s_p9_0,
 	1, -518803456, 1628680192, 2, 0,
-	_vq_quantlist__16c0_s_p9_0,
+	(long *)_vq_quantlist__16c0_s_p9_0,
 	NULL,
-	&_vq_auxt__16c0_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p9_1[] = {
+static const long _vq_quantlist__16c0_s_p9_1[] = {
 	7,
 	6,
 	8,
@@ -956,7 +956,7 @@
 	14,
 };
 
-static long _vq_lengthlist__16c0_s_p9_1[] = {
+static const long _vq_lengthlist__16c0_s_p9_1[] = {
 	 1, 5, 5, 5, 5, 9,11,11,10,10,10,10,10,10,10, 7,
 	 6, 6, 6, 6,10,10,10,10,10,10,10,10,10,10, 7, 6,
 	 6, 6, 6,10, 9,10,10,10,10,10,10,10,10,10, 7, 7,
@@ -974,35 +974,35 @@
 	10,
 };
 
-static float _vq_quantthresh__16c0_s_p9_1[] = {
+static const float _vq_quantthresh__16c0_s_p9_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__16c0_s_p9_1[] = {
+static const long _vq_quantmap__16c0_s_p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c0_s_p9_1 = {
-	_vq_quantthresh__16c0_s_p9_1,
-	_vq_quantmap__16c0_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p9_1 = {
+	(float *)_vq_quantthresh__16c0_s_p9_1,
+	(long *)_vq_quantmap__16c0_s_p9_1,
 	15,
 	15
 };
 
-static static_codebook _16c0_s_p9_1 = {
+static const static_codebook _16c0_s_p9_1 = {
 	2, 225,
-	_vq_lengthlist__16c0_s_p9_1,
+	(long *)_vq_lengthlist__16c0_s_p9_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__16c0_s_p9_1,
+	(long *)_vq_quantlist__16c0_s_p9_1,
 	NULL,
-	&_vq_auxt__16c0_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c0_s_p9_2[] = {
+static const long _vq_quantlist__16c0_s_p9_2[] = {
 	10,
 	9,
 	11,
@@ -1026,7 +1026,7 @@
 	20,
 };
 
-static long _vq_lengthlist__16c0_s_p9_2[] = {
+static const long _vq_lengthlist__16c0_s_p9_2[] = {
 	 1, 5, 5, 7, 8, 8, 7, 9, 9, 9,12,12,11,12,12,10,
 	10,11,12,12,12,11,12,12, 8, 9, 8, 7, 9,10,10,11,
 	11,10,11,12,10,12,10,12,12,12,11,12,11, 9, 8, 8,
@@ -1057,37 +1057,37 @@
 	10,11,10,10,11, 9,10,10,10,
 };
 
-static float _vq_quantthresh__16c0_s_p9_2[] = {
+static const float _vq_quantthresh__16c0_s_p9_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__16c0_s_p9_2[] = {
+static const long _vq_quantmap__16c0_s_p9_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__16c0_s_p9_2 = {
-	_vq_quantthresh__16c0_s_p9_2,
-	_vq_quantmap__16c0_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__16c0_s_p9_2 = {
+	(float *)_vq_quantthresh__16c0_s_p9_2,
+	(long *)_vq_quantmap__16c0_s_p9_2,
 	21,
 	21
 };
 
-static static_codebook _16c0_s_p9_2 = {
+static const static_codebook _16c0_s_p9_2 = {
 	2, 441,
-	_vq_lengthlist__16c0_s_p9_2,
+	(long *)_vq_lengthlist__16c0_s_p9_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__16c0_s_p9_2,
+	(long *)_vq_quantlist__16c0_s_p9_2,
 	NULL,
-	&_vq_auxt__16c0_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__16c0_s_single[] = {
+static const long _huff_lengthlist__16c0_s_single[] = {
 	 3, 4,19, 7, 9, 7, 8,11, 9,12, 4, 1,19, 6, 7, 7,
 	 8,10,11,13,18,18,18,18,18,18,18,18,18,18, 8, 6,
 	18, 8, 9, 9,11,12,14,18, 9, 6,18, 9, 7, 8, 9,11,
@@ -1097,9 +1097,9 @@
 	16,16,18,18,
 };
 
-static static_codebook _huff_book__16c0_s_single = {
+static const static_codebook _huff_book__16c0_s_single = {
 	2, 100,
-	_huff_lengthlist__16c0_s_single,
+	(long *)_huff_lengthlist__16c0_s_single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1108,7 +1108,7 @@
 	0
 };
 
-static long _huff_lengthlist__16c1_s_long[] = {
+static const long _huff_lengthlist__16c1_s_long[] = {
 	 2, 5,20, 7,10, 7, 8,10,11,11, 4, 2,20, 5, 8, 6,
 	 7, 9,10,10,20,20,20,20,19,19,19,19,19,19, 7, 5,
 	19, 6,10, 7, 9,11,13,17,11, 8,19,10, 7, 7, 8,10,
@@ -1118,9 +1118,9 @@
 	12,11,11,13,
 };
 
-static static_codebook _huff_book__16c1_s_long = {
+static const static_codebook _huff_book__16c1_s_long = {
 	2, 100,
-	_huff_lengthlist__16c1_s_long,
+	(long *)_huff_lengthlist__16c1_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1129,13 +1129,13 @@
 	0
 };
 
-static long _vq_quantlist__16c1_s_p1_0[] = {
+static const long _vq_quantlist__16c1_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c1_s_p1_0[] = {
+static const long _vq_lengthlist__16c1_s_p1_0[] = {
 	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1549,33 +1549,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c1_s_p1_0[] = {
+static const float _vq_quantthresh__16c1_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16c1_s_p1_0[] = {
+static const long _vq_quantmap__16c1_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p1_0 = {
-	_vq_quantthresh__16c1_s_p1_0,
-	_vq_quantmap__16c1_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p1_0 = {
+	(float *)_vq_quantthresh__16c1_s_p1_0,
+	(long *)_vq_quantmap__16c1_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _16c1_s_p1_0 = {
+static const static_codebook _16c1_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__16c1_s_p1_0,
+	(long *)_vq_lengthlist__16c1_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16c1_s_p1_0,
+	(long *)_vq_quantlist__16c1_s_p1_0,
 	NULL,
-	&_vq_auxt__16c1_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p3_0[] = {
+static const long _vq_quantlist__16c1_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -1583,7 +1583,7 @@
 	4,
 };
 
-static long _vq_lengthlist__16c1_s_p3_0[] = {
+static const long _vq_lengthlist__16c1_s_p3_0[] = {
 	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1626,33 +1626,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c1_s_p3_0[] = {
+static const float _vq_quantthresh__16c1_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16c1_s_p3_0[] = {
+static const long _vq_quantmap__16c1_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p3_0 = {
-	_vq_quantthresh__16c1_s_p3_0,
-	_vq_quantmap__16c1_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p3_0 = {
+	(float *)_vq_quantthresh__16c1_s_p3_0,
+	(long *)_vq_quantmap__16c1_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _16c1_s_p3_0 = {
+static const static_codebook _16c1_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__16c1_s_p3_0,
+	(long *)_vq_lengthlist__16c1_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16c1_s_p3_0,
+	(long *)_vq_quantlist__16c1_s_p3_0,
 	NULL,
-	&_vq_auxt__16c1_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p4_0[] = {
+static const long _vq_quantlist__16c1_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -1664,7 +1664,7 @@
 	8,
 };
 
-static long _vq_lengthlist__16c1_s_p4_0[] = {
+static const long _vq_lengthlist__16c1_s_p4_0[] = {
 	 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -1673,34 +1673,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c1_s_p4_0[] = {
+static const float _vq_quantthresh__16c1_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16c1_s_p4_0[] = {
+static const long _vq_quantmap__16c1_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p4_0 = {
-	_vq_quantthresh__16c1_s_p4_0,
-	_vq_quantmap__16c1_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p4_0 = {
+	(float *)_vq_quantthresh__16c1_s_p4_0,
+	(long *)_vq_quantmap__16c1_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _16c1_s_p4_0 = {
+static const static_codebook _16c1_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__16c1_s_p4_0,
+	(long *)_vq_lengthlist__16c1_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16c1_s_p4_0,
+	(long *)_vq_quantlist__16c1_s_p4_0,
 	NULL,
-	&_vq_auxt__16c1_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p5_0[] = {
+static const long _vq_quantlist__16c1_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -1712,7 +1712,7 @@
 	8,
 };
 
-static long _vq_lengthlist__16c1_s_p5_0[] = {
+static const long _vq_lengthlist__16c1_s_p5_0[] = {
 	 1, 3, 3, 5, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7,
 	 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 8, 8,
 	 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
@@ -1721,34 +1721,34 @@
 	10,
 };
 
-static float _vq_quantthresh__16c1_s_p5_0[] = {
+static const float _vq_quantthresh__16c1_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16c1_s_p5_0[] = {
+static const long _vq_quantmap__16c1_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p5_0 = {
-	_vq_quantthresh__16c1_s_p5_0,
-	_vq_quantmap__16c1_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p5_0 = {
+	(float *)_vq_quantthresh__16c1_s_p5_0,
+	(long *)_vq_quantmap__16c1_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _16c1_s_p5_0 = {
+static const static_codebook _16c1_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__16c1_s_p5_0,
+	(long *)_vq_lengthlist__16c1_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16c1_s_p5_0,
+	(long *)_vq_quantlist__16c1_s_p5_0,
 	NULL,
-	&_vq_auxt__16c1_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p6_0[] = {
+static const long _vq_quantlist__16c1_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -1768,7 +1768,7 @@
 	16,
 };
 
-static long _vq_lengthlist__16c1_s_p6_0[] = {
+static const long _vq_lengthlist__16c1_s_p6_0[] = {
 	 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,12,
 	12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -1790,42 +1790,42 @@
 	14,
 };
 
-static float _vq_quantthresh__16c1_s_p6_0[] = {
+static const float _vq_quantthresh__16c1_s_p6_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__16c1_s_p6_0[] = {
+static const long _vq_quantmap__16c1_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p6_0 = {
-	_vq_quantthresh__16c1_s_p6_0,
-	_vq_quantmap__16c1_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p6_0 = {
+	(float *)_vq_quantthresh__16c1_s_p6_0,
+	(long *)_vq_quantmap__16c1_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _16c1_s_p6_0 = {
+static const static_codebook _16c1_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__16c1_s_p6_0,
+	(long *)_vq_lengthlist__16c1_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__16c1_s_p6_0,
+	(long *)_vq_quantlist__16c1_s_p6_0,
 	NULL,
-	&_vq_auxt__16c1_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p7_0[] = {
+static const long _vq_quantlist__16c1_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c1_s_p7_0[] = {
+static const long _vq_lengthlist__16c1_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9,10,10,
 	10, 9, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11,
 	11,11,10,10, 6,10, 9,11,11,11,11,10,10, 6,10,10,
@@ -1834,33 +1834,33 @@
 	11,
 };
 
-static float _vq_quantthresh__16c1_s_p7_0[] = {
+static const float _vq_quantthresh__16c1_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__16c1_s_p7_0[] = {
+static const long _vq_quantmap__16c1_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p7_0 = {
-	_vq_quantthresh__16c1_s_p7_0,
-	_vq_quantmap__16c1_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p7_0 = {
+	(float *)_vq_quantthresh__16c1_s_p7_0,
+	(long *)_vq_quantmap__16c1_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _16c1_s_p7_0 = {
+static const static_codebook _16c1_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__16c1_s_p7_0,
+	(long *)_vq_lengthlist__16c1_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__16c1_s_p7_0,
+	(long *)_vq_quantlist__16c1_s_p7_0,
 	NULL,
-	&_vq_auxt__16c1_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p7_1[] = {
+static const long _vq_quantlist__16c1_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -1874,7 +1874,7 @@
 	10,
 };
 
-static long _vq_lengthlist__16c1_s_p7_1[] = {
+static const long _vq_lengthlist__16c1_s_p7_1[] = {
 	 2, 3, 3, 5, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6,
 	 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8,
 	 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7,
@@ -1885,35 +1885,35 @@
 	10,10,10, 8, 8, 8, 8, 9, 9,
 };
 
-static float _vq_quantthresh__16c1_s_p7_1[] = {
+static const float _vq_quantthresh__16c1_s_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__16c1_s_p7_1[] = {
+static const long _vq_quantmap__16c1_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p7_1 = {
-	_vq_quantthresh__16c1_s_p7_1,
-	_vq_quantmap__16c1_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p7_1 = {
+	(float *)_vq_quantthresh__16c1_s_p7_1,
+	(long *)_vq_quantmap__16c1_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _16c1_s_p7_1 = {
+static const static_codebook _16c1_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__16c1_s_p7_1,
+	(long *)_vq_lengthlist__16c1_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16c1_s_p7_1,
+	(long *)_vq_quantlist__16c1_s_p7_1,
 	NULL,
-	&_vq_auxt__16c1_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p8_0[] = {
+static const long _vq_quantlist__16c1_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -1929,7 +1929,7 @@
 	12,
 };
 
-static long _vq_lengthlist__16c1_s_p8_0[] = {
+static const long _vq_lengthlist__16c1_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5,
 	 7, 8, 8, 9, 8, 8, 9, 9,10,11, 6, 5, 5, 8, 8, 9,
 	 9, 8, 8, 9,10,10,11, 0, 8, 8, 8, 9, 9, 9, 9, 9,
@@ -1943,35 +1943,35 @@
 	 0,12,12,12,12,13,13,14,15,
 };
 
-static float _vq_quantthresh__16c1_s_p8_0[] = {
+static const float _vq_quantthresh__16c1_s_p8_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__16c1_s_p8_0[] = {
+static const long _vq_quantmap__16c1_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p8_0 = {
-	_vq_quantthresh__16c1_s_p8_0,
-	_vq_quantmap__16c1_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p8_0 = {
+	(float *)_vq_quantthresh__16c1_s_p8_0,
+	(long *)_vq_quantmap__16c1_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _16c1_s_p8_0 = {
+static const static_codebook _16c1_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__16c1_s_p8_0,
+	(long *)_vq_lengthlist__16c1_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__16c1_s_p8_0,
+	(long *)_vq_quantlist__16c1_s_p8_0,
 	NULL,
-	&_vq_auxt__16c1_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p8_1[] = {
+static const long _vq_quantlist__16c1_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -1979,38 +1979,38 @@
 	4,
 };
 
-static long _vq_lengthlist__16c1_s_p8_1[] = {
+static const long _vq_lengthlist__16c1_s_p8_1[] = {
 	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__16c1_s_p8_1[] = {
+static const float _vq_quantthresh__16c1_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16c1_s_p8_1[] = {
+static const long _vq_quantmap__16c1_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p8_1 = {
-	_vq_quantthresh__16c1_s_p8_1,
-	_vq_quantmap__16c1_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p8_1 = {
+	(float *)_vq_quantthresh__16c1_s_p8_1,
+	(long *)_vq_quantmap__16c1_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _16c1_s_p8_1 = {
+static const static_codebook _16c1_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__16c1_s_p8_1,
+	(long *)_vq_lengthlist__16c1_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16c1_s_p8_1,
+	(long *)_vq_quantlist__16c1_s_p8_1,
 	NULL,
-	&_vq_auxt__16c1_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p9_0[] = {
+static const long _vq_quantlist__16c1_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -2026,7 +2026,7 @@
 	12,
 };
 
-static long _vq_lengthlist__16c1_s_p9_0[] = {
+static const long _vq_lengthlist__16c1_s_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,
@@ -2040,35 +2040,35 @@
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__16c1_s_p9_0[] = {
+static const float _vq_quantthresh__16c1_s_p9_0[] = {
 	-1732.5, -1417.5, -1102.5, -787.5, -472.5, -157.5, 157.5, 472.5, 
 	787.5, 1102.5, 1417.5, 1732.5, 
 };
 
-static long _vq_quantmap__16c1_s_p9_0[] = {
+static const long _vq_quantmap__16c1_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p9_0 = {
-	_vq_quantthresh__16c1_s_p9_0,
-	_vq_quantmap__16c1_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p9_0 = {
+	(float *)_vq_quantthresh__16c1_s_p9_0,
+	(long *)_vq_quantmap__16c1_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _16c1_s_p9_0 = {
+static const static_codebook _16c1_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__16c1_s_p9_0,
+	(long *)_vq_lengthlist__16c1_s_p9_0,
 	1, -513964032, 1628680192, 4, 0,
-	_vq_quantlist__16c1_s_p9_0,
+	(long *)_vq_quantlist__16c1_s_p9_0,
 	NULL,
-	&_vq_auxt__16c1_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p9_1[] = {
+static const long _vq_quantlist__16c1_s_p9_1[] = {
 	7,
 	6,
 	8,
@@ -2086,7 +2086,7 @@
 	14,
 };
 
-static long _vq_lengthlist__16c1_s_p9_1[] = {
+static const long _vq_lengthlist__16c1_s_p9_1[] = {
 	 1, 4, 4, 4, 4, 8, 8,12,13,14,14,14,14,14,14, 6,
 	 6, 6, 6, 6,10, 9,14,14,14,14,14,14,14,14, 7, 6,
 	 5, 6, 6,10, 9,12,13,13,13,13,13,13,13,13, 7, 7,
@@ -2104,35 +2104,35 @@
 	13,
 };
 
-static float _vq_quantthresh__16c1_s_p9_1[] = {
+static const float _vq_quantthresh__16c1_s_p9_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__16c1_s_p9_1[] = {
+static const long _vq_quantmap__16c1_s_p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c1_s_p9_1 = {
-	_vq_quantthresh__16c1_s_p9_1,
-	_vq_quantmap__16c1_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p9_1 = {
+	(float *)_vq_quantthresh__16c1_s_p9_1,
+	(long *)_vq_quantmap__16c1_s_p9_1,
 	15,
 	15
 };
 
-static static_codebook _16c1_s_p9_1 = {
+static const static_codebook _16c1_s_p9_1 = {
 	2, 225,
-	_vq_lengthlist__16c1_s_p9_1,
+	(long *)_vq_lengthlist__16c1_s_p9_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__16c1_s_p9_1,
+	(long *)_vq_quantlist__16c1_s_p9_1,
 	NULL,
-	&_vq_auxt__16c1_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c1_s_p9_2[] = {
+static const long _vq_quantlist__16c1_s_p9_2[] = {
 	10,
 	9,
 	11,
@@ -2156,7 +2156,7 @@
 	20,
 };
 
-static long _vq_lengthlist__16c1_s_p9_2[] = {
+static const long _vq_lengthlist__16c1_s_p9_2[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9,10,
 	10,10, 9,10,10,11,12,12, 8, 8, 8, 8, 9, 9, 9, 9,
 	10,10,10,10,10,11,11,10,12,11,11,13,11, 7, 7, 8,
@@ -2187,37 +2187,37 @@
 	11,11,11,11,12,11,11,12,11,
 };
 
-static float _vq_quantthresh__16c1_s_p9_2[] = {
+static const float _vq_quantthresh__16c1_s_p9_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__16c1_s_p9_2[] = {
+static const long _vq_quantmap__16c1_s_p9_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__16c1_s_p9_2 = {
-	_vq_quantthresh__16c1_s_p9_2,
-	_vq_quantmap__16c1_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__16c1_s_p9_2 = {
+	(float *)_vq_quantthresh__16c1_s_p9_2,
+	(long *)_vq_quantmap__16c1_s_p9_2,
 	21,
 	21
 };
 
-static static_codebook _16c1_s_p9_2 = {
+static const static_codebook _16c1_s_p9_2 = {
 	2, 441,
-	_vq_lengthlist__16c1_s_p9_2,
+	(long *)_vq_lengthlist__16c1_s_p9_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__16c1_s_p9_2,
+	(long *)_vq_quantlist__16c1_s_p9_2,
 	NULL,
-	&_vq_auxt__16c1_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__16c1_s_short[] = {
+static const long _huff_lengthlist__16c1_s_short[] = {
 	 5, 6,17, 8,12, 9,10,10,12,13, 5, 2,17, 4, 9, 5,
 	 7, 8,11,13,16,16,16,16,16,16,16,16,16,16, 6, 4,
 	16, 5,10, 5, 7,10,14,16,13, 9,16,11, 8, 7, 8, 9,
@@ -2227,9 +2227,9 @@
 	 9, 9,10,13,
 };
 
-static static_codebook _huff_book__16c1_s_short = {
+static const static_codebook _huff_book__16c1_s_short = {
 	2, 100,
-	_huff_lengthlist__16c1_s_short,
+	(long *)_huff_lengthlist__16c1_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -2238,7 +2238,7 @@
 	0
 };
 
-static long _huff_lengthlist__16c2_s_long[] = {
+static const long _huff_lengthlist__16c2_s_long[] = {
 	 4, 7, 9, 9, 9, 8, 9,10,15,19, 5, 4, 5, 6, 7, 7,
 	 8, 9,14,16, 6, 5, 4, 5, 6, 7, 8,10,12,19, 7, 6,
 	 5, 4, 5, 6, 7, 9,11,18, 8, 7, 6, 5, 5, 5, 7, 9,
@@ -2248,9 +2248,9 @@
 	14,14,16,18,
 };
 
-static static_codebook _huff_book__16c2_s_long = {
+static const static_codebook _huff_book__16c2_s_long = {
 	2, 100,
-	_huff_lengthlist__16c2_s_long,
+	(long *)_huff_lengthlist__16c2_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -2259,13 +2259,13 @@
 	0
 };
 
-static long _vq_quantlist__16c2_s_p1_0[] = {
+static const long _vq_quantlist__16c2_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c2_s_p1_0[] = {
+static const long _vq_lengthlist__16c2_s_p1_0[] = {
 	 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
 	 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2274,33 +2274,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c2_s_p1_0[] = {
+static const float _vq_quantthresh__16c2_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__16c2_s_p1_0[] = {
+static const long _vq_quantmap__16c2_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p1_0 = {
-	_vq_quantthresh__16c2_s_p1_0,
-	_vq_quantmap__16c2_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p1_0 = {
+	(float *)_vq_quantthresh__16c2_s_p1_0,
+	(long *)_vq_quantmap__16c2_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _16c2_s_p1_0 = {
+static const static_codebook _16c2_s_p1_0 = {
 	4, 81,
-	_vq_lengthlist__16c2_s_p1_0,
+	(long *)_vq_lengthlist__16c2_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16c2_s_p1_0,
+	(long *)_vq_quantlist__16c2_s_p1_0,
 	NULL,
-	&_vq_auxt__16c2_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p2_0[] = {
+static const long _vq_quantlist__16c2_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -2308,7 +2308,7 @@
 	4,
 };
 
-static long _vq_lengthlist__16c2_s_p2_0[] = {
+static const long _vq_lengthlist__16c2_s_p2_0[] = {
 	 2, 4, 3, 7, 7, 0, 0, 0, 7, 8, 0, 0, 0, 8, 8, 0,
 	 0, 0, 8, 8, 0, 0, 0, 8, 8, 4, 5, 4, 8, 8, 0, 0,
 	 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0,
@@ -2351,33 +2351,33 @@
 	13,
 };
 
-static float _vq_quantthresh__16c2_s_p2_0[] = {
+static const float _vq_quantthresh__16c2_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16c2_s_p2_0[] = {
+static const long _vq_quantmap__16c2_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p2_0 = {
-	_vq_quantthresh__16c2_s_p2_0,
-	_vq_quantmap__16c2_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p2_0 = {
+	(float *)_vq_quantthresh__16c2_s_p2_0,
+	(long *)_vq_quantmap__16c2_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _16c2_s_p2_0 = {
+static const static_codebook _16c2_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__16c2_s_p2_0,
+	(long *)_vq_lengthlist__16c2_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16c2_s_p2_0,
+	(long *)_vq_quantlist__16c2_s_p2_0,
 	NULL,
-	&_vq_auxt__16c2_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p3_0[] = {
+static const long _vq_quantlist__16c2_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -2389,7 +2389,7 @@
 	8,
 };
 
-static long _vq_lengthlist__16c2_s_p3_0[] = {
+static const long _vq_lengthlist__16c2_s_p3_0[] = {
 	 1, 3, 3, 6, 6, 7, 7, 8, 8, 0, 0, 0, 6, 6, 7, 7,
 	 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
@@ -2398,34 +2398,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c2_s_p3_0[] = {
+static const float _vq_quantthresh__16c2_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__16c2_s_p3_0[] = {
+static const long _vq_quantmap__16c2_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p3_0 = {
-	_vq_quantthresh__16c2_s_p3_0,
-	_vq_quantmap__16c2_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p3_0 = {
+	(float *)_vq_quantthresh__16c2_s_p3_0,
+	(long *)_vq_quantmap__16c2_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _16c2_s_p3_0 = {
+static const static_codebook _16c2_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__16c2_s_p3_0,
+	(long *)_vq_lengthlist__16c2_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16c2_s_p3_0,
+	(long *)_vq_quantlist__16c2_s_p3_0,
 	NULL,
-	&_vq_auxt__16c2_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p4_0[] = {
+static const long _vq_quantlist__16c2_s_p4_0[] = {
 	8,
 	7,
 	9,
@@ -2445,7 +2445,7 @@
 	16,
 };
 
-static long _vq_lengthlist__16c2_s_p4_0[] = {
+static const long _vq_lengthlist__16c2_s_p4_0[] = {
 	 2, 3, 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,
 	10, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,
 	11,11, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,
@@ -2467,42 +2467,42 @@
 	 0,
 };
 
-static float _vq_quantthresh__16c2_s_p4_0[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p4_0[] = {
+static const long _vq_quantmap__16c2_s_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__16c2_s_p4_0 = {
-	_vq_quantthresh__16c2_s_p4_0,
-	_vq_quantmap__16c2_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p4_0 = {
+	(float *)_vq_quantthresh__16c2_s_p4_0,
+	(long *)_vq_quantmap__16c2_s_p4_0,
 	17,
 	17
 };
 
-static static_codebook _16c2_s_p4_0 = {
+static const static_codebook _16c2_s_p4_0 = {
 	2, 289,
-	_vq_lengthlist__16c2_s_p4_0,
+	(long *)_vq_lengthlist__16c2_s_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__16c2_s_p4_0,
+	(long *)_vq_quantlist__16c2_s_p4_0,
 	NULL,
-	&_vq_auxt__16c2_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p5_0[] = {
+static const long _vq_quantlist__16c2_s_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__16c2_s_p5_0[] = {
+static const long _vq_lengthlist__16c2_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,10,10,10,
 	10,10, 4, 7, 6,10,10,10,10,10,10, 5, 9, 9, 9,12,
 	11,10,11,12, 7,10,10,12,12,12,12,12,12, 7,10,10,
@@ -2511,33 +2511,33 @@
 	12,
 };
 
-static float _vq_quantthresh__16c2_s_p5_0[] = {
+static const float _vq_quantthresh__16c2_s_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__16c2_s_p5_0[] = {
+static const long _vq_quantmap__16c2_s_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p5_0 = {
-	_vq_quantthresh__16c2_s_p5_0,
-	_vq_quantmap__16c2_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p5_0 = {
+	(float *)_vq_quantthresh__16c2_s_p5_0,
+	(long *)_vq_quantmap__16c2_s_p5_0,
 	3,
 	3
 };
 
-static static_codebook _16c2_s_p5_0 = {
+static const static_codebook _16c2_s_p5_0 = {
 	4, 81,
-	_vq_lengthlist__16c2_s_p5_0,
+	(long *)_vq_lengthlist__16c2_s_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__16c2_s_p5_0,
+	(long *)_vq_quantlist__16c2_s_p5_0,
 	NULL,
-	&_vq_auxt__16c2_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p5_1[] = {
+static const long _vq_quantlist__16c2_s_p5_1[] = {
 	5,
 	4,
 	6,
@@ -2551,7 +2551,7 @@
 	10,
 };
 
-static long _vq_lengthlist__16c2_s_p5_1[] = {
+static const long _vq_lengthlist__16c2_s_p5_1[] = {
 	 2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,11,11,11, 6, 6,
 	 7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 8, 8, 8,
 	 8,11,11,11, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6,
@@ -2562,35 +2562,35 @@
 	11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__16c2_s_p5_1[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p5_1[] = {
+static const long _vq_quantmap__16c2_s_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p5_1 = {
-	_vq_quantthresh__16c2_s_p5_1,
-	_vq_quantmap__16c2_s_p5_1,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p5_1 = {
+	(float *)_vq_quantthresh__16c2_s_p5_1,
+	(long *)_vq_quantmap__16c2_s_p5_1,
 	11,
 	11
 };
 
-static static_codebook _16c2_s_p5_1 = {
+static const static_codebook _16c2_s_p5_1 = {
 	2, 121,
-	_vq_lengthlist__16c2_s_p5_1,
+	(long *)_vq_lengthlist__16c2_s_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16c2_s_p5_1,
+	(long *)_vq_quantlist__16c2_s_p5_1,
 	NULL,
-	&_vq_auxt__16c2_s_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p6_0[] = {
+static const long _vq_quantlist__16c2_s_p6_0[] = {
 	6,
 	5,
 	7,
@@ -2606,7 +2606,7 @@
 	12,
 };
 
-static long _vq_lengthlist__16c2_s_p6_0[] = {
+static const long _vq_lengthlist__16c2_s_p6_0[] = {
 	 1, 4, 4, 7, 6, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
 	 7, 7, 9, 9, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9,
 	 9,10,10,11,11,12,12, 0, 6, 6, 7, 7, 9, 9,10,10,
@@ -2620,35 +2620,35 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__16c2_s_p6_0[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p6_0[] = {
+static const long _vq_quantmap__16c2_s_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p6_0 = {
-	_vq_quantthresh__16c2_s_p6_0,
-	_vq_quantmap__16c2_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p6_0 = {
+	(float *)_vq_quantthresh__16c2_s_p6_0,
+	(long *)_vq_quantmap__16c2_s_p6_0,
 	13,
 	13
 };
 
-static static_codebook _16c2_s_p6_0 = {
+static const static_codebook _16c2_s_p6_0 = {
 	2, 169,
-	_vq_lengthlist__16c2_s_p6_0,
+	(long *)_vq_lengthlist__16c2_s_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__16c2_s_p6_0,
+	(long *)_vq_quantlist__16c2_s_p6_0,
 	NULL,
-	&_vq_auxt__16c2_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p6_1[] = {
+static const long _vq_quantlist__16c2_s_p6_1[] = {
 	2,
 	1,
 	3,
@@ -2656,38 +2656,38 @@
 	4,
 };
 
-static long _vq_lengthlist__16c2_s_p6_1[] = {
+static const long _vq_lengthlist__16c2_s_p6_1[] = {
 	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__16c2_s_p6_1[] = {
+static const float _vq_quantthresh__16c2_s_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__16c2_s_p6_1[] = {
+static const long _vq_quantmap__16c2_s_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p6_1 = {
-	_vq_quantthresh__16c2_s_p6_1,
-	_vq_quantmap__16c2_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p6_1 = {
+	(float *)_vq_quantthresh__16c2_s_p6_1,
+	(long *)_vq_quantmap__16c2_s_p6_1,
 	5,
 	5
 };
 
-static static_codebook _16c2_s_p6_1 = {
+static const static_codebook _16c2_s_p6_1 = {
 	2, 25,
-	_vq_lengthlist__16c2_s_p6_1,
+	(long *)_vq_lengthlist__16c2_s_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16c2_s_p6_1,
+	(long *)_vq_quantlist__16c2_s_p6_1,
 	NULL,
-	&_vq_auxt__16c2_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p7_0[] = {
+static const long _vq_quantlist__16c2_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -2703,7 +2703,7 @@
 	12,
 };
 
-static long _vq_lengthlist__16c2_s_p7_0[] = {
+static const long _vq_lengthlist__16c2_s_p7_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
 	 8, 8, 9, 9,10,10,11,11,12,12, 6, 5, 5, 8, 8, 9,
 	 9,10,10,11,11,12,13,18, 6, 6, 7, 7, 9, 9,10,10,
@@ -2717,35 +2717,35 @@
 	18,13,14,13,13,14,13,15,14,
 };
 
-static float _vq_quantthresh__16c2_s_p7_0[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p7_0[] = {
+static const long _vq_quantmap__16c2_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p7_0 = {
-	_vq_quantthresh__16c2_s_p7_0,
-	_vq_quantmap__16c2_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p7_0 = {
+	(float *)_vq_quantthresh__16c2_s_p7_0,
+	(long *)_vq_quantmap__16c2_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _16c2_s_p7_0 = {
+static const static_codebook _16c2_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__16c2_s_p7_0,
+	(long *)_vq_lengthlist__16c2_s_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__16c2_s_p7_0,
+	(long *)_vq_quantlist__16c2_s_p7_0,
 	NULL,
-	&_vq_auxt__16c2_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p7_1[] = {
+static const long _vq_quantlist__16c2_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -2759,7 +2759,7 @@
 	10,
 };
 
-static long _vq_lengthlist__16c2_s_p7_1[] = {
+static const long _vq_lengthlist__16c2_s_p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 6,
 	 7, 7, 8, 8, 8, 8, 9, 9, 9, 6, 6, 7, 7, 8, 8, 8,
 	 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7,
@@ -2770,35 +2770,35 @@
 	 9, 9, 9, 7, 7, 7, 7, 8, 8,
 };
 
-static float _vq_quantthresh__16c2_s_p7_1[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p7_1[] = {
+static const long _vq_quantmap__16c2_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p7_1 = {
-	_vq_quantthresh__16c2_s_p7_1,
-	_vq_quantmap__16c2_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p7_1 = {
+	(float *)_vq_quantthresh__16c2_s_p7_1,
+	(long *)_vq_quantmap__16c2_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _16c2_s_p7_1 = {
+static const static_codebook _16c2_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__16c2_s_p7_1,
+	(long *)_vq_lengthlist__16c2_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16c2_s_p7_1,
+	(long *)_vq_quantlist__16c2_s_p7_1,
 	NULL,
-	&_vq_auxt__16c2_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p8_0[] = {
+static const long _vq_quantlist__16c2_s_p8_0[] = {
 	7,
 	6,
 	8,
@@ -2816,7 +2816,7 @@
 	14,
 };
 
-static long _vq_lengthlist__16c2_s_p8_0[] = {
+static const long _vq_lengthlist__16c2_s_p8_0[] = {
 	 1, 4, 4, 7, 6, 7, 7, 6, 6, 8, 8, 9, 9,10,10, 6,
 	 6, 6, 8, 8, 9, 8, 8, 8, 9, 9,11,10,11,11, 7, 6,
 	 6, 8, 8, 9, 8, 7, 7, 9, 9,10,10,12,11,14, 8, 8,
@@ -2834,35 +2834,35 @@
 	13,
 };
 
-static float _vq_quantthresh__16c2_s_p8_0[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p8_0[] = {
+static const long _vq_quantmap__16c2_s_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p8_0 = {
-	_vq_quantthresh__16c2_s_p8_0,
-	_vq_quantmap__16c2_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p8_0 = {
+	(float *)_vq_quantthresh__16c2_s_p8_0,
+	(long *)_vq_quantmap__16c2_s_p8_0,
 	15,
 	15
 };
 
-static static_codebook _16c2_s_p8_0 = {
+static const static_codebook _16c2_s_p8_0 = {
 	2, 225,
-	_vq_lengthlist__16c2_s_p8_0,
+	(long *)_vq_lengthlist__16c2_s_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__16c2_s_p8_0,
+	(long *)_vq_quantlist__16c2_s_p8_0,
 	NULL,
-	&_vq_auxt__16c2_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p8_1[] = {
+static const long _vq_quantlist__16c2_s_p8_1[] = {
 	10,
 	9,
 	11,
@@ -2886,7 +2886,7 @@
 	20,
 };
 
-static long _vq_lengthlist__16c2_s_p8_1[] = {
+static const long _vq_lengthlist__16c2_s_p8_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8,11,12,11, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9,10, 9, 9,11,11,10, 7, 7, 8,
@@ -2917,37 +2917,37 @@
 	10,11,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__16c2_s_p8_1[] = {
+static const float _vq_quantthresh__16c2_s_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__16c2_s_p8_1[] = {
+static const long _vq_quantmap__16c2_s_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__16c2_s_p8_1 = {
-	_vq_quantthresh__16c2_s_p8_1,
-	_vq_quantmap__16c2_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p8_1 = {
+	(float *)_vq_quantthresh__16c2_s_p8_1,
+	(long *)_vq_quantmap__16c2_s_p8_1,
 	21,
 	21
 };
 
-static static_codebook _16c2_s_p8_1 = {
+static const static_codebook _16c2_s_p8_1 = {
 	2, 441,
-	_vq_lengthlist__16c2_s_p8_1,
+	(long *)_vq_lengthlist__16c2_s_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__16c2_s_p8_1,
+	(long *)_vq_quantlist__16c2_s_p8_1,
 	NULL,
-	&_vq_auxt__16c2_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p9_0[] = {
+static const long _vq_quantlist__16c2_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -2963,7 +2963,7 @@
 	12,
 };
 
-static long _vq_lengthlist__16c2_s_p9_0[] = {
+static const long _vq_lengthlist__16c2_s_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,
@@ -2977,35 +2977,35 @@
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__16c2_s_p9_0[] = {
+static const float _vq_quantthresh__16c2_s_p9_0[] = {
 	-5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -465.5, 465.5, 1396.5, 
 	2327.5, 3258.5, 4189.5, 5120.5, 
 };
 
-static long _vq_quantmap__16c2_s_p9_0[] = {
+static const long _vq_quantmap__16c2_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p9_0 = {
-	_vq_quantthresh__16c2_s_p9_0,
-	_vq_quantmap__16c2_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p9_0 = {
+	(float *)_vq_quantthresh__16c2_s_p9_0,
+	(long *)_vq_quantmap__16c2_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _16c2_s_p9_0 = {
+static const static_codebook _16c2_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__16c2_s_p9_0,
+	(long *)_vq_lengthlist__16c2_s_p9_0,
 	1, -510275072, 1631393792, 4, 0,
-	_vq_quantlist__16c2_s_p9_0,
+	(long *)_vq_quantlist__16c2_s_p9_0,
 	NULL,
-	&_vq_auxt__16c2_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p9_1[] = {
+static const long _vq_quantlist__16c2_s_p9_1[] = {
 	8,
 	7,
 	9,
@@ -3025,7 +3025,7 @@
 	16,
 };
 
-static long _vq_lengthlist__16c2_s_p9_1[] = {
+static const long _vq_lengthlist__16c2_s_p9_1[] = {
 	 1, 5, 5, 9, 8, 7, 7, 7, 6,10,11,11,11,11,11,11,
 	11, 8, 7, 6, 8, 8,10, 9,10,10,10, 9,11,10,10,10,
 	10,10, 8, 6, 6, 8, 8, 9, 8, 9, 8, 9,10,10,10,10,
@@ -3047,36 +3047,36 @@
 	10,
 };
 
-static float _vq_quantthresh__16c2_s_p9_1[] = {
+static const float _vq_quantthresh__16c2_s_p9_1[] = {
 	-367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 
 	24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, 367.5, 
 };
 
-static long _vq_quantmap__16c2_s_p9_1[] = {
+static const long _vq_quantmap__16c2_s_p9_1[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p9_1 = {
-	_vq_quantthresh__16c2_s_p9_1,
-	_vq_quantmap__16c2_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p9_1 = {
+	(float *)_vq_quantthresh__16c2_s_p9_1,
+	(long *)_vq_quantmap__16c2_s_p9_1,
 	17,
 	17
 };
 
-static static_codebook _16c2_s_p9_1 = {
+static const static_codebook _16c2_s_p9_1 = {
 	2, 289,
-	_vq_lengthlist__16c2_s_p9_1,
+	(long *)_vq_lengthlist__16c2_s_p9_1,
 	1, -518488064, 1622704128, 5, 0,
-	_vq_quantlist__16c2_s_p9_1,
+	(long *)_vq_quantlist__16c2_s_p9_1,
 	NULL,
-	&_vq_auxt__16c2_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16c2_s_p9_2[] = {
+static const long _vq_quantlist__16c2_s_p9_2[] = {
 	13,
 	12,
 	14,
@@ -3106,44 +3106,44 @@
 	26,
 };
 
-static long _vq_lengthlist__16c2_s_p9_2[] = {
+static const long _vq_lengthlist__16c2_s_p9_2[] = {
 	 1, 4, 4, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 8, 7, 8, 7, 7, 4, 4,
 };
 
-static float _vq_quantthresh__16c2_s_p9_2[] = {
+static const float _vq_quantthresh__16c2_s_p9_2[] = {
 	-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, 0.5, 1.5, 2.5, 
 	3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 
 	11.5, 12.5, 
 };
 
-static long _vq_quantmap__16c2_s_p9_2[] = {
+static const long _vq_quantmap__16c2_s_p9_2[] = {
 	   25,   23,   21,   19,   17,   15,   13,   11,
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,   12,   14,   16,   18,   20,
 	   22,   24,   26,
 };
 
-static encode_aux_threshmatch _vq_auxt__16c2_s_p9_2 = {
-	_vq_quantthresh__16c2_s_p9_2,
-	_vq_quantmap__16c2_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__16c2_s_p9_2 = {
+	(float *)_vq_quantthresh__16c2_s_p9_2,
+	(long *)_vq_quantmap__16c2_s_p9_2,
 	27,
 	27
 };
 
-static static_codebook _16c2_s_p9_2 = {
+static const static_codebook _16c2_s_p9_2 = {
 	1, 27,
-	_vq_lengthlist__16c2_s_p9_2,
+	(long *)_vq_lengthlist__16c2_s_p9_2,
 	1, -528875520, 1611661312, 5, 0,
-	_vq_quantlist__16c2_s_p9_2,
+	(long *)_vq_quantlist__16c2_s_p9_2,
 	NULL,
-	&_vq_auxt__16c2_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__16c2_s_short[] = {
+static const long _huff_lengthlist__16c2_s_short[] = {
 	 7,10,11,11,11,14,15,15,17,14, 8, 6, 7, 7, 8, 9,
 	11,11,14,17, 9, 6, 6, 6, 7, 7,10,11,15,16, 9, 6,
 	 6, 4, 4, 5, 8, 9,12,16,10, 6, 6, 4, 4, 4, 6, 9,
@@ -3153,9 +3153,9 @@
 	15,12,14,14,
 };
 
-static static_codebook _huff_book__16c2_s_short = {
+static const static_codebook _huff_book__16c2_s_short = {
 	2, 100,
-	_huff_lengthlist__16c2_s_short,
+	(long *)_huff_lengthlist__16c2_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -3164,13 +3164,13 @@
 	0
 };
 
-static long _vq_quantlist__8c0_s_p1_0[] = {
+static const long _vq_quantlist__8c0_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c0_s_p1_0[] = {
+static const long _vq_lengthlist__8c0_s_p1_0[] = {
 	 1, 5, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3584,33 +3584,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p1_0[] = {
+static const float _vq_quantthresh__8c0_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8c0_s_p1_0[] = {
+static const long _vq_quantmap__8c0_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p1_0 = {
-	_vq_quantthresh__8c0_s_p1_0,
-	_vq_quantmap__8c0_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p1_0 = {
+	(float *)_vq_quantthresh__8c0_s_p1_0,
+	(long *)_vq_quantmap__8c0_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _8c0_s_p1_0 = {
+static const static_codebook _8c0_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__8c0_s_p1_0,
+	(long *)_vq_lengthlist__8c0_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8c0_s_p1_0,
+	(long *)_vq_quantlist__8c0_s_p1_0,
 	NULL,
-	&_vq_auxt__8c0_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p3_0[] = {
+static const long _vq_quantlist__8c0_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -3618,7 +3618,7 @@
 	4,
 };
 
-static long _vq_lengthlist__8c0_s_p3_0[] = {
+static const long _vq_lengthlist__8c0_s_p3_0[] = {
 	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 7, 7, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3661,33 +3661,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p3_0[] = {
+static const float _vq_quantthresh__8c0_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c0_s_p3_0[] = {
+static const long _vq_quantmap__8c0_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p3_0 = {
-	_vq_quantthresh__8c0_s_p3_0,
-	_vq_quantmap__8c0_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p3_0 = {
+	(float *)_vq_quantthresh__8c0_s_p3_0,
+	(long *)_vq_quantmap__8c0_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _8c0_s_p3_0 = {
+static const static_codebook _8c0_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__8c0_s_p3_0,
+	(long *)_vq_lengthlist__8c0_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c0_s_p3_0,
+	(long *)_vq_quantlist__8c0_s_p3_0,
 	NULL,
-	&_vq_auxt__8c0_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p4_0[] = {
+static const long _vq_quantlist__8c0_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -3699,7 +3699,7 @@
 	8,
 };
 
-static long _vq_lengthlist__8c0_s_p4_0[] = {
+static const long _vq_lengthlist__8c0_s_p4_0[] = {
 	 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -3708,34 +3708,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p4_0[] = {
+static const float _vq_quantthresh__8c0_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8c0_s_p4_0[] = {
+static const long _vq_quantmap__8c0_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p4_0 = {
-	_vq_quantthresh__8c0_s_p4_0,
-	_vq_quantmap__8c0_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p4_0 = {
+	(float *)_vq_quantthresh__8c0_s_p4_0,
+	(long *)_vq_quantmap__8c0_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _8c0_s_p4_0 = {
+static const static_codebook _8c0_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__8c0_s_p4_0,
+	(long *)_vq_lengthlist__8c0_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c0_s_p4_0,
+	(long *)_vq_quantlist__8c0_s_p4_0,
 	NULL,
-	&_vq_auxt__8c0_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p5_0[] = {
+static const long _vq_quantlist__8c0_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -3747,7 +3747,7 @@
 	8,
 };
 
-static long _vq_lengthlist__8c0_s_p5_0[] = {
+static const long _vq_lengthlist__8c0_s_p5_0[] = {
 	 1, 3, 3, 5, 5, 7, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7,
 	 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 9, 0, 0, 0, 8, 8,
 	 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0,
@@ -3756,34 +3756,34 @@
 	10,
 };
 
-static float _vq_quantthresh__8c0_s_p5_0[] = {
+static const float _vq_quantthresh__8c0_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8c0_s_p5_0[] = {
+static const long _vq_quantmap__8c0_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p5_0 = {
-	_vq_quantthresh__8c0_s_p5_0,
-	_vq_quantmap__8c0_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p5_0 = {
+	(float *)_vq_quantthresh__8c0_s_p5_0,
+	(long *)_vq_quantmap__8c0_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _8c0_s_p5_0 = {
+static const static_codebook _8c0_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__8c0_s_p5_0,
+	(long *)_vq_lengthlist__8c0_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c0_s_p5_0,
+	(long *)_vq_quantlist__8c0_s_p5_0,
 	NULL,
-	&_vq_auxt__8c0_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p6_0[] = {
+static const long _vq_quantlist__8c0_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -3803,7 +3803,7 @@
 	16,
 };
 
-static long _vq_lengthlist__8c0_s_p6_0[] = {
+static const long _vq_lengthlist__8c0_s_p6_0[] = {
 	 1, 3, 3, 6, 6, 8, 8, 9, 9, 8, 8,10, 9,10,10,11,
 	11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	11,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -3825,42 +3825,42 @@
 	14,
 };
 
-static float _vq_quantthresh__8c0_s_p6_0[] = {
+static const float _vq_quantthresh__8c0_s_p6_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__8c0_s_p6_0[] = {
+static const long _vq_quantmap__8c0_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p6_0 = {
-	_vq_quantthresh__8c0_s_p6_0,
-	_vq_quantmap__8c0_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p6_0 = {
+	(float *)_vq_quantthresh__8c0_s_p6_0,
+	(long *)_vq_quantmap__8c0_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _8c0_s_p6_0 = {
+static const static_codebook _8c0_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__8c0_s_p6_0,
+	(long *)_vq_lengthlist__8c0_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__8c0_s_p6_0,
+	(long *)_vq_quantlist__8c0_s_p6_0,
 	NULL,
-	&_vq_auxt__8c0_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p7_0[] = {
+static const long _vq_quantlist__8c0_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c0_s_p7_0[] = {
+static const long _vq_lengthlist__8c0_s_p7_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,11, 9,10,12,
 	 9,10, 4, 7, 7,10,10,10,11, 9, 9, 6,11,10,11,11,
 	12,11,11,11, 6,10,10,11,11,12,11,10,10, 6, 9,10,
@@ -3869,33 +3869,33 @@
 	10,
 };
 
-static float _vq_quantthresh__8c0_s_p7_0[] = {
+static const float _vq_quantthresh__8c0_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__8c0_s_p7_0[] = {
+static const long _vq_quantmap__8c0_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p7_0 = {
-	_vq_quantthresh__8c0_s_p7_0,
-	_vq_quantmap__8c0_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p7_0 = {
+	(float *)_vq_quantthresh__8c0_s_p7_0,
+	(long *)_vq_quantmap__8c0_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _8c0_s_p7_0 = {
+static const static_codebook _8c0_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__8c0_s_p7_0,
+	(long *)_vq_lengthlist__8c0_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__8c0_s_p7_0,
+	(long *)_vq_quantlist__8c0_s_p7_0,
 	NULL,
-	&_vq_auxt__8c0_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p7_1[] = {
+static const long _vq_quantlist__8c0_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -3909,7 +3909,7 @@
 	10,
 };
 
-static long _vq_lengthlist__8c0_s_p7_1[] = {
+static const long _vq_lengthlist__8c0_s_p7_1[] = {
 	 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, 7, 7,
 	 8, 8, 9, 9, 9, 9,10,10, 9, 7, 7, 8, 8, 9, 9, 9,
 	 9,10,10,10, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10, 8,
@@ -3920,35 +3920,35 @@
 	10,10,10, 9, 9, 9,10,10,10,
 };
 
-static float _vq_quantthresh__8c0_s_p7_1[] = {
+static const float _vq_quantthresh__8c0_s_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__8c0_s_p7_1[] = {
+static const long _vq_quantmap__8c0_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p7_1 = {
-	_vq_quantthresh__8c0_s_p7_1,
-	_vq_quantmap__8c0_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p7_1 = {
+	(float *)_vq_quantthresh__8c0_s_p7_1,
+	(long *)_vq_quantmap__8c0_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _8c0_s_p7_1 = {
+static const static_codebook _8c0_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__8c0_s_p7_1,
+	(long *)_vq_lengthlist__8c0_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8c0_s_p7_1,
+	(long *)_vq_quantlist__8c0_s_p7_1,
 	NULL,
-	&_vq_auxt__8c0_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p8_0[] = {
+static const long _vq_quantlist__8c0_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -3964,7 +3964,7 @@
 	12,
 };
 
-static long _vq_lengthlist__8c0_s_p8_0[] = {
+static const long _vq_lengthlist__8c0_s_p8_0[] = {
 	 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 6, 6,
 	 7, 7, 8, 8, 7, 7, 8, 9,10,10, 7, 6, 6, 7, 7, 8,
 	 7, 7, 7, 9, 9,10,12, 0, 8, 8, 8, 8, 8, 9, 8, 8,
@@ -3978,35 +3978,35 @@
 	 0, 0,13,13,11,13,13,11,12,
 };
 
-static float _vq_quantthresh__8c0_s_p8_0[] = {
+static const float _vq_quantthresh__8c0_s_p8_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__8c0_s_p8_0[] = {
+static const long _vq_quantmap__8c0_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p8_0 = {
-	_vq_quantthresh__8c0_s_p8_0,
-	_vq_quantmap__8c0_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p8_0 = {
+	(float *)_vq_quantthresh__8c0_s_p8_0,
+	(long *)_vq_quantmap__8c0_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _8c0_s_p8_0 = {
+static const static_codebook _8c0_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__8c0_s_p8_0,
+	(long *)_vq_lengthlist__8c0_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__8c0_s_p8_0,
+	(long *)_vq_quantlist__8c0_s_p8_0,
 	NULL,
-	&_vq_auxt__8c0_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p8_1[] = {
+static const long _vq_quantlist__8c0_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -4014,44 +4014,44 @@
 	4,
 };
 
-static long _vq_lengthlist__8c0_s_p8_1[] = {
+static const long _vq_lengthlist__8c0_s_p8_1[] = {
 	 1, 3, 4, 5, 5, 7, 6, 6, 6, 5, 7, 7, 7, 6, 6, 7,
 	 7, 7, 6, 6, 7, 7, 7, 6, 6,
 };
 
-static float _vq_quantthresh__8c0_s_p8_1[] = {
+static const float _vq_quantthresh__8c0_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c0_s_p8_1[] = {
+static const long _vq_quantmap__8c0_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p8_1 = {
-	_vq_quantthresh__8c0_s_p8_1,
-	_vq_quantmap__8c0_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p8_1 = {
+	(float *)_vq_quantthresh__8c0_s_p8_1,
+	(long *)_vq_quantmap__8c0_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _8c0_s_p8_1 = {
+static const static_codebook _8c0_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__8c0_s_p8_1,
+	(long *)_vq_lengthlist__8c0_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c0_s_p8_1,
+	(long *)_vq_quantlist__8c0_s_p8_1,
 	NULL,
-	&_vq_auxt__8c0_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p9_0[] = {
+static const long _vq_quantlist__8c0_s_p9_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c0_s_p9_0[] = {
+static const long _vq_lengthlist__8c0_s_p9_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,
@@ -4060,33 +4060,33 @@
 	 7,
 };
 
-static float _vq_quantthresh__8c0_s_p9_0[] = {
+static const float _vq_quantthresh__8c0_s_p9_0[] = {
 	-157.5, 157.5, 
 };
 
-static long _vq_quantmap__8c0_s_p9_0[] = {
+static const long _vq_quantmap__8c0_s_p9_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p9_0 = {
-	_vq_quantthresh__8c0_s_p9_0,
-	_vq_quantmap__8c0_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p9_0 = {
+	(float *)_vq_quantthresh__8c0_s_p9_0,
+	(long *)_vq_quantmap__8c0_s_p9_0,
 	3,
 	3
 };
 
-static static_codebook _8c0_s_p9_0 = {
+static const static_codebook _8c0_s_p9_0 = {
 	4, 81,
-	_vq_lengthlist__8c0_s_p9_0,
+	(long *)_vq_lengthlist__8c0_s_p9_0,
 	1, -518803456, 1628680192, 2, 0,
-	_vq_quantlist__8c0_s_p9_0,
+	(long *)_vq_quantlist__8c0_s_p9_0,
 	NULL,
-	&_vq_auxt__8c0_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p9_1[] = {
+static const long _vq_quantlist__8c0_s_p9_1[] = {
 	7,
 	6,
 	8,
@@ -4104,7 +4104,7 @@
 	14,
 };
 
-static long _vq_lengthlist__8c0_s_p9_1[] = {
+static const long _vq_lengthlist__8c0_s_p9_1[] = {
 	 1, 4, 4, 5, 5,10, 8,11,11,11,11,11,11,11,11, 6,
 	 6, 6, 7, 6,11,10,11,11,11,11,11,11,11,11, 7, 5,
 	 6, 6, 6, 8, 7,11,11,11,11,11,11,11,11,11, 7, 8,
@@ -4122,35 +4122,35 @@
 	11,
 };
 
-static float _vq_quantthresh__8c0_s_p9_1[] = {
+static const float _vq_quantthresh__8c0_s_p9_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__8c0_s_p9_1[] = {
+static const long _vq_quantmap__8c0_s_p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p9_1 = {
-	_vq_quantthresh__8c0_s_p9_1,
-	_vq_quantmap__8c0_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p9_1 = {
+	(float *)_vq_quantthresh__8c0_s_p9_1,
+	(long *)_vq_quantmap__8c0_s_p9_1,
 	15,
 	15
 };
 
-static static_codebook _8c0_s_p9_1 = {
+static const static_codebook _8c0_s_p9_1 = {
 	2, 225,
-	_vq_lengthlist__8c0_s_p9_1,
+	(long *)_vq_lengthlist__8c0_s_p9_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__8c0_s_p9_1,
+	(long *)_vq_quantlist__8c0_s_p9_1,
 	NULL,
-	&_vq_auxt__8c0_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p9_2[] = {
+static const long _vq_quantlist__8c0_s_p9_2[] = {
 	10,
 	9,
 	11,
@@ -4174,7 +4174,7 @@
 	20,
 };
 
-static long _vq_lengthlist__8c0_s_p9_2[] = {
+static const long _vq_lengthlist__8c0_s_p9_2[] = {
 	 1, 5, 5, 7, 7, 8, 7, 8, 8,10,10, 9, 9,10,10,10,
 	11,11,10,12,11,12,12,12, 9, 8, 8, 8, 8, 8, 9,10,
 	10,10,10,11,11,11,10,11,11,12,12,11,12, 8, 8, 7,
@@ -4205,37 +4205,37 @@
 	10,11, 9,11,10, 9,10, 9,10,
 };
 
-static float _vq_quantthresh__8c0_s_p9_2[] = {
+static const float _vq_quantthresh__8c0_s_p9_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__8c0_s_p9_2[] = {
+static const long _vq_quantmap__8c0_s_p9_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__8c0_s_p9_2 = {
-	_vq_quantthresh__8c0_s_p9_2,
-	_vq_quantmap__8c0_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__8c0_s_p9_2 = {
+	(float *)_vq_quantthresh__8c0_s_p9_2,
+	(long *)_vq_quantmap__8c0_s_p9_2,
 	21,
 	21
 };
 
-static static_codebook _8c0_s_p9_2 = {
+static const static_codebook _8c0_s_p9_2 = {
 	2, 441,
-	_vq_lengthlist__8c0_s_p9_2,
+	(long *)_vq_lengthlist__8c0_s_p9_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__8c0_s_p9_2,
+	(long *)_vq_quantlist__8c0_s_p9_2,
 	NULL,
-	&_vq_auxt__8c0_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__8c0_s_single[] = {
+static const long _huff_lengthlist__8c0_s_single[] = {
 	 4, 5,18, 7,10, 6, 7, 8, 9,10, 5, 2,18, 5, 7, 5,
 	 6, 7, 8,11,17,17,17,17,17,17,17,17,17,17, 7, 4,
 	17, 6, 9, 6, 8,10,12,15,11, 7,17, 9, 6, 6, 7, 9,
@@ -4245,9 +4245,9 @@
 	17,16,17,17,
 };
 
-static static_codebook _huff_book__8c0_s_single = {
+static const static_codebook _huff_book__8c0_s_single = {
 	2, 100,
-	_huff_lengthlist__8c0_s_single,
+	(long *)_huff_lengthlist__8c0_s_single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -4256,13 +4256,13 @@
 	0
 };
 
-static long _vq_quantlist__8c1_s_p1_0[] = {
+static const long _vq_quantlist__8c1_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c1_s_p1_0[] = {
+static const long _vq_lengthlist__8c1_s_p1_0[] = {
 	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4676,33 +4676,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p1_0[] = {
+static const float _vq_quantthresh__8c1_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8c1_s_p1_0[] = {
+static const long _vq_quantmap__8c1_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p1_0 = {
-	_vq_quantthresh__8c1_s_p1_0,
-	_vq_quantmap__8c1_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p1_0 = {
+	(float *)_vq_quantthresh__8c1_s_p1_0,
+	(long *)_vq_quantmap__8c1_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _8c1_s_p1_0 = {
+static const static_codebook _8c1_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__8c1_s_p1_0,
+	(long *)_vq_lengthlist__8c1_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8c1_s_p1_0,
+	(long *)_vq_quantlist__8c1_s_p1_0,
 	NULL,
-	&_vq_auxt__8c1_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p3_0[] = {
+static const long _vq_quantlist__8c1_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -4710,7 +4710,7 @@
 	4,
 };
 
-static long _vq_lengthlist__8c1_s_p3_0[] = {
+static const long _vq_lengthlist__8c1_s_p3_0[] = {
 	 2, 4, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4753,33 +4753,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p3_0[] = {
+static const float _vq_quantthresh__8c1_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c1_s_p3_0[] = {
+static const long _vq_quantmap__8c1_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p3_0 = {
-	_vq_quantthresh__8c1_s_p3_0,
-	_vq_quantmap__8c1_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p3_0 = {
+	(float *)_vq_quantthresh__8c1_s_p3_0,
+	(long *)_vq_quantmap__8c1_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _8c1_s_p3_0 = {
+static const static_codebook _8c1_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__8c1_s_p3_0,
+	(long *)_vq_lengthlist__8c1_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c1_s_p3_0,
+	(long *)_vq_quantlist__8c1_s_p3_0,
 	NULL,
-	&_vq_auxt__8c1_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p4_0[] = {
+static const long _vq_quantlist__8c1_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -4791,7 +4791,7 @@
 	8,
 };
 
-static long _vq_lengthlist__8c1_s_p4_0[] = {
+static const long _vq_lengthlist__8c1_s_p4_0[] = {
 	 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -4800,34 +4800,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p4_0[] = {
+static const float _vq_quantthresh__8c1_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8c1_s_p4_0[] = {
+static const long _vq_quantmap__8c1_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p4_0 = {
-	_vq_quantthresh__8c1_s_p4_0,
-	_vq_quantmap__8c1_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p4_0 = {
+	(float *)_vq_quantthresh__8c1_s_p4_0,
+	(long *)_vq_quantmap__8c1_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _8c1_s_p4_0 = {
+static const static_codebook _8c1_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__8c1_s_p4_0,
+	(long *)_vq_lengthlist__8c1_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c1_s_p4_0,
+	(long *)_vq_quantlist__8c1_s_p4_0,
 	NULL,
-	&_vq_auxt__8c1_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p5_0[] = {
+static const long _vq_quantlist__8c1_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -4839,7 +4839,7 @@
 	8,
 };
 
-static long _vq_lengthlist__8c1_s_p5_0[] = {
+static const long _vq_lengthlist__8c1_s_p5_0[] = {
 	 1, 3, 3, 4, 5, 6, 6, 8, 8, 0, 0, 0, 8, 8, 7, 7,
 	 9, 9, 0, 0, 0, 8, 8, 7, 7, 9, 9, 0, 0, 0, 9,10,
 	 8, 8, 9, 9, 0, 0, 0,10,10, 8, 8, 9, 9, 0, 0, 0,
@@ -4848,34 +4848,34 @@
 	10,
 };
 
-static float _vq_quantthresh__8c1_s_p5_0[] = {
+static const float _vq_quantthresh__8c1_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8c1_s_p5_0[] = {
+static const long _vq_quantmap__8c1_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p5_0 = {
-	_vq_quantthresh__8c1_s_p5_0,
-	_vq_quantmap__8c1_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p5_0 = {
+	(float *)_vq_quantthresh__8c1_s_p5_0,
+	(long *)_vq_quantmap__8c1_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _8c1_s_p5_0 = {
+static const static_codebook _8c1_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__8c1_s_p5_0,
+	(long *)_vq_lengthlist__8c1_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c1_s_p5_0,
+	(long *)_vq_quantlist__8c1_s_p5_0,
 	NULL,
-	&_vq_auxt__8c1_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p6_0[] = {
+static const long _vq_quantlist__8c1_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -4895,7 +4895,7 @@
 	16,
 };
 
-static long _vq_lengthlist__8c1_s_p6_0[] = {
+static const long _vq_lengthlist__8c1_s_p6_0[] = {
 	 1, 3, 3, 5, 5, 8, 8, 8, 8, 9, 9,10,10,11,11,11,
 	11, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -4917,42 +4917,42 @@
 	14,
 };
 
-static float _vq_quantthresh__8c1_s_p6_0[] = {
+static const float _vq_quantthresh__8c1_s_p6_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__8c1_s_p6_0[] = {
+static const long _vq_quantmap__8c1_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p6_0 = {
-	_vq_quantthresh__8c1_s_p6_0,
-	_vq_quantmap__8c1_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p6_0 = {
+	(float *)_vq_quantthresh__8c1_s_p6_0,
+	(long *)_vq_quantmap__8c1_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _8c1_s_p6_0 = {
+static const static_codebook _8c1_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__8c1_s_p6_0,
+	(long *)_vq_lengthlist__8c1_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__8c1_s_p6_0,
+	(long *)_vq_quantlist__8c1_s_p6_0,
 	NULL,
-	&_vq_auxt__8c1_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p7_0[] = {
+static const long _vq_quantlist__8c1_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c1_s_p7_0[] = {
+static const long _vq_lengthlist__8c1_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10,
 	 9, 9, 5, 7, 7,10, 9, 9,10, 9, 9, 6,10,10,10,10,
 	10,11,10,10, 6, 9, 9,10, 9,10,11,10,10, 6, 9, 9,
@@ -4961,33 +4961,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__8c1_s_p7_0[] = {
+static const float _vq_quantthresh__8c1_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__8c1_s_p7_0[] = {
+static const long _vq_quantmap__8c1_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p7_0 = {
-	_vq_quantthresh__8c1_s_p7_0,
-	_vq_quantmap__8c1_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p7_0 = {
+	(float *)_vq_quantthresh__8c1_s_p7_0,
+	(long *)_vq_quantmap__8c1_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _8c1_s_p7_0 = {
+static const static_codebook _8c1_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__8c1_s_p7_0,
+	(long *)_vq_lengthlist__8c1_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__8c1_s_p7_0,
+	(long *)_vq_quantlist__8c1_s_p7_0,
 	NULL,
-	&_vq_auxt__8c1_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p7_1[] = {
+static const long _vq_quantlist__8c1_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -5001,7 +5001,7 @@
 	10,
 };
 
-static long _vq_lengthlist__8c1_s_p7_1[] = {
+static const long _vq_lengthlist__8c1_s_p7_1[] = {
 	 2, 3, 3, 5, 5, 7, 7, 7, 7, 7, 7,10,10, 9, 7, 7,
 	 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8,
 	 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7,
@@ -5012,35 +5012,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__8c1_s_p7_1[] = {
+static const float _vq_quantthresh__8c1_s_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__8c1_s_p7_1[] = {
+static const long _vq_quantmap__8c1_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p7_1 = {
-	_vq_quantthresh__8c1_s_p7_1,
-	_vq_quantmap__8c1_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p7_1 = {
+	(float *)_vq_quantthresh__8c1_s_p7_1,
+	(long *)_vq_quantmap__8c1_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _8c1_s_p7_1 = {
+static const static_codebook _8c1_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__8c1_s_p7_1,
+	(long *)_vq_lengthlist__8c1_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8c1_s_p7_1,
+	(long *)_vq_quantlist__8c1_s_p7_1,
 	NULL,
-	&_vq_auxt__8c1_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p8_0[] = {
+static const long _vq_quantlist__8c1_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -5056,7 +5056,7 @@
 	12,
 };
 
-static long _vq_lengthlist__8c1_s_p8_0[] = {
+static const long _vq_lengthlist__8c1_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -5070,35 +5070,35 @@
 	 0,12,12,11,10,12,11,13,12,
 };
 
-static float _vq_quantthresh__8c1_s_p8_0[] = {
+static const float _vq_quantthresh__8c1_s_p8_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__8c1_s_p8_0[] = {
+static const long _vq_quantmap__8c1_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p8_0 = {
-	_vq_quantthresh__8c1_s_p8_0,
-	_vq_quantmap__8c1_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p8_0 = {
+	(float *)_vq_quantthresh__8c1_s_p8_0,
+	(long *)_vq_quantmap__8c1_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _8c1_s_p8_0 = {
+static const static_codebook _8c1_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__8c1_s_p8_0,
+	(long *)_vq_lengthlist__8c1_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__8c1_s_p8_0,
+	(long *)_vq_quantlist__8c1_s_p8_0,
 	NULL,
-	&_vq_auxt__8c1_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p8_1[] = {
+static const long _vq_quantlist__8c1_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -5106,38 +5106,38 @@
 	4,
 };
 
-static long _vq_lengthlist__8c1_s_p8_1[] = {
+static const long _vq_lengthlist__8c1_s_p8_1[] = {
 	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__8c1_s_p8_1[] = {
+static const float _vq_quantthresh__8c1_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c1_s_p8_1[] = {
+static const long _vq_quantmap__8c1_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p8_1 = {
-	_vq_quantthresh__8c1_s_p8_1,
-	_vq_quantmap__8c1_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p8_1 = {
+	(float *)_vq_quantthresh__8c1_s_p8_1,
+	(long *)_vq_quantmap__8c1_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _8c1_s_p8_1 = {
+static const static_codebook _8c1_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__8c1_s_p8_1,
+	(long *)_vq_lengthlist__8c1_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c1_s_p8_1,
+	(long *)_vq_quantlist__8c1_s_p8_1,
 	NULL,
-	&_vq_auxt__8c1_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p9_0[] = {
+static const long _vq_quantlist__8c1_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -5153,7 +5153,7 @@
 	12,
 };
 
-static long _vq_lengthlist__8c1_s_p9_0[] = {
+static const long _vq_lengthlist__8c1_s_p9_0[] = {
 	 1, 3, 3,10,10,10,10,10,10,10,10,10,10, 5, 6, 6,
 	10,10,10,10,10,10,10,10,10,10, 6, 7, 8,10,10,10,
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
@@ -5167,35 +5167,35 @@
 	10,10,10,10,10, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__8c1_s_p9_0[] = {
+static const float _vq_quantthresh__8c1_s_p9_0[] = {
 	-1732.5, -1417.5, -1102.5, -787.5, -472.5, -157.5, 157.5, 472.5, 
 	787.5, 1102.5, 1417.5, 1732.5, 
 };
 
-static long _vq_quantmap__8c1_s_p9_0[] = {
+static const long _vq_quantmap__8c1_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p9_0 = {
-	_vq_quantthresh__8c1_s_p9_0,
-	_vq_quantmap__8c1_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p9_0 = {
+	(float *)_vq_quantthresh__8c1_s_p9_0,
+	(long *)_vq_quantmap__8c1_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _8c1_s_p9_0 = {
+static const static_codebook _8c1_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__8c1_s_p9_0,
+	(long *)_vq_lengthlist__8c1_s_p9_0,
 	1, -513964032, 1628680192, 4, 0,
-	_vq_quantlist__8c1_s_p9_0,
+	(long *)_vq_quantlist__8c1_s_p9_0,
 	NULL,
-	&_vq_auxt__8c1_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p9_1[] = {
+static const long _vq_quantlist__8c1_s_p9_1[] = {
 	7,
 	6,
 	8,
@@ -5213,7 +5213,7 @@
 	14,
 };
 
-static long _vq_lengthlist__8c1_s_p9_1[] = {
+static const long _vq_lengthlist__8c1_s_p9_1[] = {
 	 1, 4, 4, 5, 5, 7, 7, 9, 9,11,11,12,12,13,13, 6,
 	 5, 5, 6, 6, 9, 9,10,10,12,12,12,13,15,14, 6, 5,
 	 5, 7, 7, 9, 9,10,10,12,12,12,13,14,13,17, 7, 7,
@@ -5231,35 +5231,35 @@
 	15,
 };
 
-static float _vq_quantthresh__8c1_s_p9_1[] = {
+static const float _vq_quantthresh__8c1_s_p9_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__8c1_s_p9_1[] = {
+static const long _vq_quantmap__8c1_s_p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p9_1 = {
-	_vq_quantthresh__8c1_s_p9_1,
-	_vq_quantmap__8c1_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p9_1 = {
+	(float *)_vq_quantthresh__8c1_s_p9_1,
+	(long *)_vq_quantmap__8c1_s_p9_1,
 	15,
 	15
 };
 
-static static_codebook _8c1_s_p9_1 = {
+static const static_codebook _8c1_s_p9_1 = {
 	2, 225,
-	_vq_lengthlist__8c1_s_p9_1,
+	(long *)_vq_lengthlist__8c1_s_p9_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__8c1_s_p9_1,
+	(long *)_vq_quantlist__8c1_s_p9_1,
 	NULL,
-	&_vq_auxt__8c1_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p9_2[] = {
+static const long _vq_quantlist__8c1_s_p9_2[] = {
 	10,
 	9,
 	11,
@@ -5283,7 +5283,7 @@
 	20,
 };
 
-static long _vq_lengthlist__8c1_s_p9_2[] = {
+static const long _vq_lengthlist__8c1_s_p9_2[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9,
 	 9, 9, 9, 9, 9,11,11,12, 7, 7, 7, 7, 8, 8, 9, 9,
 	 9, 9,10,10,10,10,10,10,10,10,11,11,11, 7, 7, 7,
@@ -5314,37 +5314,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__8c1_s_p9_2[] = {
+static const float _vq_quantthresh__8c1_s_p9_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__8c1_s_p9_2[] = {
+static const long _vq_quantmap__8c1_s_p9_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__8c1_s_p9_2 = {
-	_vq_quantthresh__8c1_s_p9_2,
-	_vq_quantmap__8c1_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__8c1_s_p9_2 = {
+	(float *)_vq_quantthresh__8c1_s_p9_2,
+	(long *)_vq_quantmap__8c1_s_p9_2,
 	21,
 	21
 };
 
-static static_codebook _8c1_s_p9_2 = {
+static const static_codebook _8c1_s_p9_2 = {
 	2, 441,
-	_vq_lengthlist__8c1_s_p9_2,
+	(long *)_vq_lengthlist__8c1_s_p9_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__8c1_s_p9_2,
+	(long *)_vq_quantlist__8c1_s_p9_2,
 	NULL,
-	&_vq_auxt__8c1_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__8c1_s_single[] = {
+static const long _huff_lengthlist__8c1_s_single[] = {
 	 4, 6,18, 8,11, 8, 8, 9, 9,10, 4, 4,18, 5, 9, 5,
 	 6, 7, 8,10,18,18,18,18,17,17,17,17,17,17, 7, 5,
 	17, 6,11, 6, 7, 8, 9,12,12, 9,17,12, 8, 8, 9,10,
@@ -5354,9 +5354,9 @@
 	 9, 7, 7, 8,
 };
 
-static static_codebook _huff_book__8c1_s_single = {
+static const static_codebook _huff_book__8c1_s_single = {
 	2, 100,
-	_huff_lengthlist__8c1_s_single,
+	(long *)_huff_lengthlist__8c1_s_single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -5365,7 +5365,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c2_s_long[] = {
+static const long _huff_lengthlist__44c2_s_long[] = {
 	 6, 6,12,10,10,10, 9,10,12,12, 6, 1,10, 5, 6, 6,
 	 7, 9,11,14,12, 9, 8,11, 7, 8, 9,11,13,15,10, 5,
 	12, 7, 8, 7, 9,12,14,15,10, 6, 7, 8, 5, 6, 7, 9,
@@ -5375,9 +5375,9 @@
 	10, 8, 8, 9,
 };
 
-static static_codebook _huff_book__44c2_s_long = {
+static const static_codebook _huff_book__44c2_s_long = {
 	2, 100,
-	_huff_lengthlist__44c2_s_long,
+	(long *)_huff_lengthlist__44c2_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -5386,13 +5386,13 @@
 	0
 };
 
-static long _vq_quantlist__44c2_s_p1_0[] = {
+static const long _vq_quantlist__44c2_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c2_s_p1_0[] = {
+static const long _vq_lengthlist__44c2_s_p1_0[] = {
 	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0,
 	 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5806,33 +5806,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c2_s_p1_0[] = {
+static const float _vq_quantthresh__44c2_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c2_s_p1_0[] = {
+static const long _vq_quantmap__44c2_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p1_0 = {
-	_vq_quantthresh__44c2_s_p1_0,
-	_vq_quantmap__44c2_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p1_0 = {
+	(float *)_vq_quantthresh__44c2_s_p1_0,
+	(long *)_vq_quantmap__44c2_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c2_s_p1_0 = {
+static const static_codebook _44c2_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c2_s_p1_0,
+	(long *)_vq_lengthlist__44c2_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c2_s_p1_0,
+	(long *)_vq_quantlist__44c2_s_p1_0,
 	NULL,
-	&_vq_auxt__44c2_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p2_0[] = {
+static const long _vq_quantlist__44c2_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -5840,7 +5840,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c2_s_p2_0[] = {
+static const long _vq_lengthlist__44c2_s_p2_0[] = {
 	 1, 4, 4, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,
 	 8, 8, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8,
 	 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
@@ -5883,33 +5883,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c2_s_p2_0[] = {
+static const float _vq_quantthresh__44c2_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c2_s_p2_0[] = {
+static const long _vq_quantmap__44c2_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p2_0 = {
-	_vq_quantthresh__44c2_s_p2_0,
-	_vq_quantmap__44c2_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p2_0 = {
+	(float *)_vq_quantthresh__44c2_s_p2_0,
+	(long *)_vq_quantmap__44c2_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c2_s_p2_0 = {
+static const static_codebook _44c2_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c2_s_p2_0,
+	(long *)_vq_lengthlist__44c2_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c2_s_p2_0,
+	(long *)_vq_quantlist__44c2_s_p2_0,
 	NULL,
-	&_vq_auxt__44c2_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p3_0[] = {
+static const long _vq_quantlist__44c2_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -5917,7 +5917,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c2_s_p3_0[] = {
+static const long _vq_lengthlist__44c2_s_p3_0[] = {
 	 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5960,33 +5960,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c2_s_p3_0[] = {
+static const float _vq_quantthresh__44c2_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c2_s_p3_0[] = {
+static const long _vq_quantmap__44c2_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p3_0 = {
-	_vq_quantthresh__44c2_s_p3_0,
-	_vq_quantmap__44c2_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p3_0 = {
+	(float *)_vq_quantthresh__44c2_s_p3_0,
+	(long *)_vq_quantmap__44c2_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _44c2_s_p3_0 = {
+static const static_codebook _44c2_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__44c2_s_p3_0,
+	(long *)_vq_lengthlist__44c2_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c2_s_p3_0,
+	(long *)_vq_quantlist__44c2_s_p3_0,
 	NULL,
-	&_vq_auxt__44c2_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p4_0[] = {
+static const long _vq_quantlist__44c2_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -5998,7 +5998,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c2_s_p4_0[] = {
+static const long _vq_lengthlist__44c2_s_p4_0[] = {
 	 1, 3, 3, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0,
 	 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 7, 7, 6, 6,
 	 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -6007,34 +6007,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c2_s_p4_0[] = {
+static const float _vq_quantthresh__44c2_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c2_s_p4_0[] = {
+static const long _vq_quantmap__44c2_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p4_0 = {
-	_vq_quantthresh__44c2_s_p4_0,
-	_vq_quantmap__44c2_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p4_0 = {
+	(float *)_vq_quantthresh__44c2_s_p4_0,
+	(long *)_vq_quantmap__44c2_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c2_s_p4_0 = {
+static const static_codebook _44c2_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c2_s_p4_0,
+	(long *)_vq_lengthlist__44c2_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c2_s_p4_0,
+	(long *)_vq_quantlist__44c2_s_p4_0,
 	NULL,
-	&_vq_auxt__44c2_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p5_0[] = {
+static const long _vq_quantlist__44c2_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -6046,7 +6046,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c2_s_p5_0[] = {
+static const long _vq_lengthlist__44c2_s_p5_0[] = {
 	 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 7, 7, 7, 7, 7, 7,
 	 9, 9, 0, 7, 7, 7, 7, 7, 7, 9, 9, 0, 8, 8, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
@@ -6055,34 +6055,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44c2_s_p5_0[] = {
+static const float _vq_quantthresh__44c2_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c2_s_p5_0[] = {
+static const long _vq_quantmap__44c2_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p5_0 = {
-	_vq_quantthresh__44c2_s_p5_0,
-	_vq_quantmap__44c2_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p5_0 = {
+	(float *)_vq_quantthresh__44c2_s_p5_0,
+	(long *)_vq_quantmap__44c2_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _44c2_s_p5_0 = {
+static const static_codebook _44c2_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__44c2_s_p5_0,
+	(long *)_vq_lengthlist__44c2_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c2_s_p5_0,
+	(long *)_vq_quantlist__44c2_s_p5_0,
 	NULL,
-	&_vq_auxt__44c2_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p6_0[] = {
+static const long _vq_quantlist__44c2_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -6102,7 +6102,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c2_s_p6_0[] = {
+static const long _vq_lengthlist__44c2_s_p6_0[] = {
 	 1, 4, 3, 6, 6, 8, 8, 9, 9, 9, 9, 9, 9,10,10,11,
 	11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -6124,42 +6124,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44c2_s_p6_0[] = {
+static const float _vq_quantthresh__44c2_s_p6_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__44c2_s_p6_0[] = {
+static const long _vq_quantmap__44c2_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p6_0 = {
-	_vq_quantthresh__44c2_s_p6_0,
-	_vq_quantmap__44c2_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p6_0 = {
+	(float *)_vq_quantthresh__44c2_s_p6_0,
+	(long *)_vq_quantmap__44c2_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _44c2_s_p6_0 = {
+static const static_codebook _44c2_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__44c2_s_p6_0,
+	(long *)_vq_lengthlist__44c2_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c2_s_p6_0,
+	(long *)_vq_quantlist__44c2_s_p6_0,
 	NULL,
-	&_vq_auxt__44c2_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p7_0[] = {
+static const long _vq_quantlist__44c2_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c2_s_p7_0[] = {
+static const long _vq_lengthlist__44c2_s_p7_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,10, 9, 9, 7,10,10,11,10,
 	11,11,10,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
@@ -6168,33 +6168,33 @@
 	11,
 };
 
-static float _vq_quantthresh__44c2_s_p7_0[] = {
+static const float _vq_quantthresh__44c2_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c2_s_p7_0[] = {
+static const long _vq_quantmap__44c2_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p7_0 = {
-	_vq_quantthresh__44c2_s_p7_0,
-	_vq_quantmap__44c2_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p7_0 = {
+	(float *)_vq_quantthresh__44c2_s_p7_0,
+	(long *)_vq_quantmap__44c2_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _44c2_s_p7_0 = {
+static const static_codebook _44c2_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__44c2_s_p7_0,
+	(long *)_vq_lengthlist__44c2_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c2_s_p7_0,
+	(long *)_vq_quantlist__44c2_s_p7_0,
 	NULL,
-	&_vq_auxt__44c2_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p7_1[] = {
+static const long _vq_quantlist__44c2_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -6208,7 +6208,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c2_s_p7_1[] = {
+static const long _vq_lengthlist__44c2_s_p7_1[] = {
 	 2, 3, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 7, 7, 6, 6,
 	 7, 7, 8, 8, 8, 8, 9, 6, 6, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7,
@@ -6219,35 +6219,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c2_s_p7_1[] = {
+static const float _vq_quantthresh__44c2_s_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__44c2_s_p7_1[] = {
+static const long _vq_quantmap__44c2_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p7_1 = {
-	_vq_quantthresh__44c2_s_p7_1,
-	_vq_quantmap__44c2_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p7_1 = {
+	(float *)_vq_quantthresh__44c2_s_p7_1,
+	(long *)_vq_quantmap__44c2_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c2_s_p7_1 = {
+static const static_codebook _44c2_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c2_s_p7_1,
+	(long *)_vq_lengthlist__44c2_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c2_s_p7_1,
+	(long *)_vq_quantlist__44c2_s_p7_1,
 	NULL,
-	&_vq_auxt__44c2_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p8_0[] = {
+static const long _vq_quantlist__44c2_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -6263,7 +6263,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c2_s_p8_0[] = {
+static const long _vq_lengthlist__44c2_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8,
 	 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -6277,35 +6277,35 @@
 	 0,12,12,12,12,13,12,14,14,
 };
 
-static float _vq_quantthresh__44c2_s_p8_0[] = {
+static const float _vq_quantthresh__44c2_s_p8_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__44c2_s_p8_0[] = {
+static const long _vq_quantmap__44c2_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p8_0 = {
-	_vq_quantthresh__44c2_s_p8_0,
-	_vq_quantmap__44c2_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p8_0 = {
+	(float *)_vq_quantthresh__44c2_s_p8_0,
+	(long *)_vq_quantmap__44c2_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c2_s_p8_0 = {
+static const static_codebook _44c2_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c2_s_p8_0,
+	(long *)_vq_lengthlist__44c2_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c2_s_p8_0,
+	(long *)_vq_quantlist__44c2_s_p8_0,
 	NULL,
-	&_vq_auxt__44c2_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p8_1[] = {
+static const long _vq_quantlist__44c2_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -6313,38 +6313,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c2_s_p8_1[] = {
+static const long _vq_lengthlist__44c2_s_p8_1[] = {
 	 2, 4, 4, 5, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c2_s_p8_1[] = {
+static const float _vq_quantthresh__44c2_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c2_s_p8_1[] = {
+static const long _vq_quantmap__44c2_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p8_1 = {
-	_vq_quantthresh__44c2_s_p8_1,
-	_vq_quantmap__44c2_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p8_1 = {
+	(float *)_vq_quantthresh__44c2_s_p8_1,
+	(long *)_vq_quantmap__44c2_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _44c2_s_p8_1 = {
+static const static_codebook _44c2_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__44c2_s_p8_1,
+	(long *)_vq_lengthlist__44c2_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c2_s_p8_1,
+	(long *)_vq_quantlist__44c2_s_p8_1,
 	NULL,
-	&_vq_auxt__44c2_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p9_0[] = {
+static const long _vq_quantlist__44c2_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -6360,7 +6360,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c2_s_p9_0[] = {
+static const long _vq_lengthlist__44c2_s_p9_0[] = {
 	 1, 5, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8,
 	11,11,11,11,11,11,11,11,11,11, 2, 8, 7,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -6374,35 +6374,35 @@
 	11,11,11,11,11,11,11,11,11,
 };
 
-static float _vq_quantthresh__44c2_s_p9_0[] = {
+static const float _vq_quantthresh__44c2_s_p9_0[] = {
 	-1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 
 	552.5, 773.5, 994.5, 1215.5, 
 };
 
-static long _vq_quantmap__44c2_s_p9_0[] = {
+static const long _vq_quantmap__44c2_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p9_0 = {
-	_vq_quantthresh__44c2_s_p9_0,
-	_vq_quantmap__44c2_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p9_0 = {
+	(float *)_vq_quantthresh__44c2_s_p9_0,
+	(long *)_vq_quantmap__44c2_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _44c2_s_p9_0 = {
+static const static_codebook _44c2_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__44c2_s_p9_0,
+	(long *)_vq_lengthlist__44c2_s_p9_0,
 	1, -514541568, 1627103232, 4, 0,
-	_vq_quantlist__44c2_s_p9_0,
+	(long *)_vq_quantlist__44c2_s_p9_0,
 	NULL,
-	&_vq_auxt__44c2_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p9_1[] = {
+static const long _vq_quantlist__44c2_s_p9_1[] = {
 	6,
 	5,
 	7,
@@ -6418,7 +6418,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c2_s_p9_1[] = {
+static const long _vq_lengthlist__44c2_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 6, 8, 8,10, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 7,10, 9,11,11,12,13, 6, 5, 5, 7, 7, 8,
 	 8,10,10,11,11,13,13,18, 8, 8, 8, 8, 9, 9,10,10,
@@ -6432,35 +6432,35 @@
 	17,13,12,12,10,13,11,14,14,
 };
 
-static float _vq_quantthresh__44c2_s_p9_1[] = {
+static const float _vq_quantthresh__44c2_s_p9_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44c2_s_p9_1[] = {
+static const long _vq_quantmap__44c2_s_p9_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c2_s_p9_1 = {
-	_vq_quantthresh__44c2_s_p9_1,
-	_vq_quantmap__44c2_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p9_1 = {
+	(float *)_vq_quantthresh__44c2_s_p9_1,
+	(long *)_vq_quantmap__44c2_s_p9_1,
 	13,
 	13
 };
 
-static static_codebook _44c2_s_p9_1 = {
+static const static_codebook _44c2_s_p9_1 = {
 	2, 169,
-	_vq_lengthlist__44c2_s_p9_1,
+	(long *)_vq_lengthlist__44c2_s_p9_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c2_s_p9_1,
+	(long *)_vq_quantlist__44c2_s_p9_1,
 	NULL,
-	&_vq_auxt__44c2_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c2_s_p9_2[] = {
+static const long _vq_quantlist__44c2_s_p9_2[] = {
 	8,
 	7,
 	9,
@@ -6480,7 +6480,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c2_s_p9_2[] = {
+static const long _vq_lengthlist__44c2_s_p9_2[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
 	 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
 	 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
@@ -6502,36 +6502,36 @@
 	10,
 };
 
-static float _vq_quantthresh__44c2_s_p9_2[] = {
+static const float _vq_quantthresh__44c2_s_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__44c2_s_p9_2[] = {
+static const long _vq_quantmap__44c2_s_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__44c2_s_p9_2 = {
-	_vq_quantthresh__44c2_s_p9_2,
-	_vq_quantmap__44c2_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c2_s_p9_2 = {
+	(float *)_vq_quantthresh__44c2_s_p9_2,
+	(long *)_vq_quantmap__44c2_s_p9_2,
 	17,
 	17
 };
 
-static static_codebook _44c2_s_p9_2 = {
+static const static_codebook _44c2_s_p9_2 = {
 	2, 289,
-	_vq_lengthlist__44c2_s_p9_2,
+	(long *)_vq_lengthlist__44c2_s_p9_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c2_s_p9_2,
+	(long *)_vq_quantlist__44c2_s_p9_2,
 	NULL,
-	&_vq_auxt__44c2_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c2_s_short[] = {
+static const long _huff_lengthlist__44c2_s_short[] = {
 	11, 9,13,12,12,11,12,12,13,15, 8, 2,11, 4, 8, 5,
 	 7,10,12,15,13, 7,10, 9, 8, 8,10,13,17,17,11, 4,
 	12, 5, 9, 5, 8,11,14,16,12, 6, 8, 7, 6, 6, 8,11,
@@ -6541,9 +6541,9 @@
 	 6, 8, 9,12,
 };
 
-static static_codebook _huff_book__44c2_s_short = {
+static const static_codebook _huff_book__44c2_s_short = {
 	2, 100,
-	_huff_lengthlist__44c2_s_short,
+	(long *)_huff_lengthlist__44c2_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -6552,7 +6552,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c3_s_long[] = {
+static const long _huff_lengthlist__44c3_s_long[] = {
 	 5, 6,11,11,11,11,10,10,12,11, 5, 2,11, 5, 6, 6,
 	 7, 9,11,13,13,10, 7,11, 6, 7, 8, 9,10,12,11, 5,
 	11, 6, 8, 7, 9,11,14,15,11, 6, 6, 8, 4, 5, 7, 8,
@@ -6562,9 +6562,9 @@
 	 9, 8, 8, 8,
 };
 
-static static_codebook _huff_book__44c3_s_long = {
+static const static_codebook _huff_book__44c3_s_long = {
 	2, 100,
-	_huff_lengthlist__44c3_s_long,
+	(long *)_huff_lengthlist__44c3_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -6573,13 +6573,13 @@
 	0
 };
 
-static long _vq_quantlist__44c3_s_p1_0[] = {
+static const long _vq_quantlist__44c3_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c3_s_p1_0[] = {
+static const long _vq_lengthlist__44c3_s_p1_0[] = {
 	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0,
 	 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6993,33 +6993,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c3_s_p1_0[] = {
+static const float _vq_quantthresh__44c3_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c3_s_p1_0[] = {
+static const long _vq_quantmap__44c3_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p1_0 = {
-	_vq_quantthresh__44c3_s_p1_0,
-	_vq_quantmap__44c3_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p1_0 = {
+	(float *)_vq_quantthresh__44c3_s_p1_0,
+	(long *)_vq_quantmap__44c3_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c3_s_p1_0 = {
+static const static_codebook _44c3_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c3_s_p1_0,
+	(long *)_vq_lengthlist__44c3_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c3_s_p1_0,
+	(long *)_vq_quantlist__44c3_s_p1_0,
 	NULL,
-	&_vq_auxt__44c3_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p2_0[] = {
+static const long _vq_quantlist__44c3_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -7027,7 +7027,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c3_s_p2_0[] = {
+static const long _vq_lengthlist__44c3_s_p2_0[] = {
 	 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
 	 7, 8, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7,
 	 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
@@ -7070,33 +7070,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c3_s_p2_0[] = {
+static const float _vq_quantthresh__44c3_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c3_s_p2_0[] = {
+static const long _vq_quantmap__44c3_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p2_0 = {
-	_vq_quantthresh__44c3_s_p2_0,
-	_vq_quantmap__44c3_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p2_0 = {
+	(float *)_vq_quantthresh__44c3_s_p2_0,
+	(long *)_vq_quantmap__44c3_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c3_s_p2_0 = {
+static const static_codebook _44c3_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c3_s_p2_0,
+	(long *)_vq_lengthlist__44c3_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c3_s_p2_0,
+	(long *)_vq_quantlist__44c3_s_p2_0,
 	NULL,
-	&_vq_auxt__44c3_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p3_0[] = {
+static const long _vq_quantlist__44c3_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -7104,7 +7104,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c3_s_p3_0[] = {
+static const long _vq_lengthlist__44c3_s_p3_0[] = {
 	 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -7147,33 +7147,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c3_s_p3_0[] = {
+static const float _vq_quantthresh__44c3_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c3_s_p3_0[] = {
+static const long _vq_quantmap__44c3_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p3_0 = {
-	_vq_quantthresh__44c3_s_p3_0,
-	_vq_quantmap__44c3_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p3_0 = {
+	(float *)_vq_quantthresh__44c3_s_p3_0,
+	(long *)_vq_quantmap__44c3_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _44c3_s_p3_0 = {
+static const static_codebook _44c3_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__44c3_s_p3_0,
+	(long *)_vq_lengthlist__44c3_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c3_s_p3_0,
+	(long *)_vq_quantlist__44c3_s_p3_0,
 	NULL,
-	&_vq_auxt__44c3_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p4_0[] = {
+static const long _vq_quantlist__44c3_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -7185,7 +7185,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c3_s_p4_0[] = {
+static const long _vq_lengthlist__44c3_s_p4_0[] = {
 	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
 	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
@@ -7194,34 +7194,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c3_s_p4_0[] = {
+static const float _vq_quantthresh__44c3_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c3_s_p4_0[] = {
+static const long _vq_quantmap__44c3_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p4_0 = {
-	_vq_quantthresh__44c3_s_p4_0,
-	_vq_quantmap__44c3_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p4_0 = {
+	(float *)_vq_quantthresh__44c3_s_p4_0,
+	(long *)_vq_quantmap__44c3_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c3_s_p4_0 = {
+static const static_codebook _44c3_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c3_s_p4_0,
+	(long *)_vq_lengthlist__44c3_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c3_s_p4_0,
+	(long *)_vq_quantlist__44c3_s_p4_0,
 	NULL,
-	&_vq_auxt__44c3_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p5_0[] = {
+static const long _vq_quantlist__44c3_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -7233,7 +7233,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c3_s_p5_0[] = {
+static const long _vq_lengthlist__44c3_s_p5_0[] = {
 	 1, 3, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 7, 8,
 	 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8,
 	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
@@ -7242,34 +7242,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44c3_s_p5_0[] = {
+static const float _vq_quantthresh__44c3_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c3_s_p5_0[] = {
+static const long _vq_quantmap__44c3_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p5_0 = {
-	_vq_quantthresh__44c3_s_p5_0,
-	_vq_quantmap__44c3_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p5_0 = {
+	(float *)_vq_quantthresh__44c3_s_p5_0,
+	(long *)_vq_quantmap__44c3_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _44c3_s_p5_0 = {
+static const static_codebook _44c3_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__44c3_s_p5_0,
+	(long *)_vq_lengthlist__44c3_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c3_s_p5_0,
+	(long *)_vq_quantlist__44c3_s_p5_0,
 	NULL,
-	&_vq_auxt__44c3_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p6_0[] = {
+static const long _vq_quantlist__44c3_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -7289,7 +7289,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c3_s_p6_0[] = {
+static const long _vq_lengthlist__44c3_s_p6_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	10, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,
 	11,11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -7311,42 +7311,42 @@
 	13,
 };
 
-static float _vq_quantthresh__44c3_s_p6_0[] = {
+static const float _vq_quantthresh__44c3_s_p6_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__44c3_s_p6_0[] = {
+static const long _vq_quantmap__44c3_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p6_0 = {
-	_vq_quantthresh__44c3_s_p6_0,
-	_vq_quantmap__44c3_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p6_0 = {
+	(float *)_vq_quantthresh__44c3_s_p6_0,
+	(long *)_vq_quantmap__44c3_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _44c3_s_p6_0 = {
+static const static_codebook _44c3_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__44c3_s_p6_0,
+	(long *)_vq_lengthlist__44c3_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c3_s_p6_0,
+	(long *)_vq_quantlist__44c3_s_p6_0,
 	NULL,
-	&_vq_auxt__44c3_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p7_0[] = {
+static const long _vq_quantlist__44c3_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c3_s_p7_0[] = {
+static const long _vq_lengthlist__44c3_s_p7_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11,
 	10,12,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
@@ -7355,33 +7355,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44c3_s_p7_0[] = {
+static const float _vq_quantthresh__44c3_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c3_s_p7_0[] = {
+static const long _vq_quantmap__44c3_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p7_0 = {
-	_vq_quantthresh__44c3_s_p7_0,
-	_vq_quantmap__44c3_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p7_0 = {
+	(float *)_vq_quantthresh__44c3_s_p7_0,
+	(long *)_vq_quantmap__44c3_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _44c3_s_p7_0 = {
+static const static_codebook _44c3_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__44c3_s_p7_0,
+	(long *)_vq_lengthlist__44c3_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c3_s_p7_0,
+	(long *)_vq_quantlist__44c3_s_p7_0,
 	NULL,
-	&_vq_auxt__44c3_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p7_1[] = {
+static const long _vq_quantlist__44c3_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -7395,7 +7395,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c3_s_p7_1[] = {
+static const long _vq_lengthlist__44c3_s_p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
@@ -7406,35 +7406,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c3_s_p7_1[] = {
+static const float _vq_quantthresh__44c3_s_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__44c3_s_p7_1[] = {
+static const long _vq_quantmap__44c3_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p7_1 = {
-	_vq_quantthresh__44c3_s_p7_1,
-	_vq_quantmap__44c3_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p7_1 = {
+	(float *)_vq_quantthresh__44c3_s_p7_1,
+	(long *)_vq_quantmap__44c3_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c3_s_p7_1 = {
+static const static_codebook _44c3_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c3_s_p7_1,
+	(long *)_vq_lengthlist__44c3_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c3_s_p7_1,
+	(long *)_vq_quantlist__44c3_s_p7_1,
 	NULL,
-	&_vq_auxt__44c3_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p8_0[] = {
+static const long _vq_quantlist__44c3_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -7450,7 +7450,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c3_s_p8_0[] = {
+static const long _vq_lengthlist__44c3_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8,
 	 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -7464,35 +7464,35 @@
 	 0,13,13,12,12,13,12,14,13,
 };
 
-static float _vq_quantthresh__44c3_s_p8_0[] = {
+static const float _vq_quantthresh__44c3_s_p8_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__44c3_s_p8_0[] = {
+static const long _vq_quantmap__44c3_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p8_0 = {
-	_vq_quantthresh__44c3_s_p8_0,
-	_vq_quantmap__44c3_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p8_0 = {
+	(float *)_vq_quantthresh__44c3_s_p8_0,
+	(long *)_vq_quantmap__44c3_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c3_s_p8_0 = {
+static const static_codebook _44c3_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c3_s_p8_0,
+	(long *)_vq_lengthlist__44c3_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c3_s_p8_0,
+	(long *)_vq_quantlist__44c3_s_p8_0,
 	NULL,
-	&_vq_auxt__44c3_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p8_1[] = {
+static const long _vq_quantlist__44c3_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -7500,38 +7500,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c3_s_p8_1[] = {
+static const long _vq_lengthlist__44c3_s_p8_1[] = {
 	 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c3_s_p8_1[] = {
+static const float _vq_quantthresh__44c3_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c3_s_p8_1[] = {
+static const long _vq_quantmap__44c3_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p8_1 = {
-	_vq_quantthresh__44c3_s_p8_1,
-	_vq_quantmap__44c3_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p8_1 = {
+	(float *)_vq_quantthresh__44c3_s_p8_1,
+	(long *)_vq_quantmap__44c3_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _44c3_s_p8_1 = {
+static const static_codebook _44c3_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__44c3_s_p8_1,
+	(long *)_vq_lengthlist__44c3_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c3_s_p8_1,
+	(long *)_vq_quantlist__44c3_s_p8_1,
 	NULL,
-	&_vq_auxt__44c3_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p9_0[] = {
+static const long _vq_quantlist__44c3_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -7547,7 +7547,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c3_s_p9_0[] = {
+static const long _vq_lengthlist__44c3_s_p9_0[] = {
 	 1, 4, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8,
 	12,12,12,12,12,12,12,12,12,12, 2, 9, 7,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@@ -7561,35 +7561,35 @@
 	11,11,11,11,11,11,11,11,11,
 };
 
-static float _vq_quantthresh__44c3_s_p9_0[] = {
+static const float _vq_quantthresh__44c3_s_p9_0[] = {
 	-1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, 
 	637.5, 892.5, 1147.5, 1402.5, 
 };
 
-static long _vq_quantmap__44c3_s_p9_0[] = {
+static const long _vq_quantmap__44c3_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p9_0 = {
-	_vq_quantthresh__44c3_s_p9_0,
-	_vq_quantmap__44c3_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p9_0 = {
+	(float *)_vq_quantthresh__44c3_s_p9_0,
+	(long *)_vq_quantmap__44c3_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _44c3_s_p9_0 = {
+static const static_codebook _44c3_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__44c3_s_p9_0,
+	(long *)_vq_lengthlist__44c3_s_p9_0,
 	1, -514332672, 1627381760, 4, 0,
-	_vq_quantlist__44c3_s_p9_0,
+	(long *)_vq_quantlist__44c3_s_p9_0,
 	NULL,
-	&_vq_auxt__44c3_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p9_1[] = {
+static const long _vq_quantlist__44c3_s_p9_1[] = {
 	7,
 	6,
 	8,
@@ -7607,7 +7607,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c3_s_p9_1[] = {
+static const long _vq_lengthlist__44c3_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 9,10,10,10,10, 6,
 	 5, 5, 7, 7, 8, 8,10, 8,11,10,12,12,13,13, 6, 5,
 	 5, 7, 7, 8, 8,10, 9,11,11,12,12,13,12,18, 8, 8,
@@ -7625,35 +7625,35 @@
 	15,
 };
 
-static float _vq_quantthresh__44c3_s_p9_1[] = {
+static const float _vq_quantthresh__44c3_s_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__44c3_s_p9_1[] = {
+static const long _vq_quantmap__44c3_s_p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c3_s_p9_1 = {
-	_vq_quantthresh__44c3_s_p9_1,
-	_vq_quantmap__44c3_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p9_1 = {
+	(float *)_vq_quantthresh__44c3_s_p9_1,
+	(long *)_vq_quantmap__44c3_s_p9_1,
 	15,
 	15
 };
 
-static static_codebook _44c3_s_p9_1 = {
+static const static_codebook _44c3_s_p9_1 = {
 	2, 225,
-	_vq_lengthlist__44c3_s_p9_1,
+	(long *)_vq_lengthlist__44c3_s_p9_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__44c3_s_p9_1,
+	(long *)_vq_quantlist__44c3_s_p9_1,
 	NULL,
-	&_vq_auxt__44c3_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c3_s_p9_2[] = {
+static const long _vq_quantlist__44c3_s_p9_2[] = {
 	8,
 	7,
 	9,
@@ -7673,7 +7673,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c3_s_p9_2[] = {
+static const long _vq_lengthlist__44c3_s_p9_2[] = {
 	 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
 	 8,10, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 9, 9, 9,
 	 9, 9,10, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9,
@@ -7695,36 +7695,36 @@
 	10,
 };
 
-static float _vq_quantthresh__44c3_s_p9_2[] = {
+static const float _vq_quantthresh__44c3_s_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__44c3_s_p9_2[] = {
+static const long _vq_quantmap__44c3_s_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__44c3_s_p9_2 = {
-	_vq_quantthresh__44c3_s_p9_2,
-	_vq_quantmap__44c3_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c3_s_p9_2 = {
+	(float *)_vq_quantthresh__44c3_s_p9_2,
+	(long *)_vq_quantmap__44c3_s_p9_2,
 	17,
 	17
 };
 
-static static_codebook _44c3_s_p9_2 = {
+static const static_codebook _44c3_s_p9_2 = {
 	2, 289,
-	_vq_lengthlist__44c3_s_p9_2,
+	(long *)_vq_lengthlist__44c3_s_p9_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c3_s_p9_2,
+	(long *)_vq_quantlist__44c3_s_p9_2,
 	NULL,
-	&_vq_auxt__44c3_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c3_s_short[] = {
+static const long _huff_lengthlist__44c3_s_short[] = {
 	10, 9,13,11,14,10,12,13,13,14, 7, 2,12, 5,10, 5,
 	 7,10,12,14,12, 6, 9, 8, 7, 7, 9,11,13,16,10, 4,
 	12, 5,10, 6, 8,12,14,16,12, 6, 8, 7, 6, 5, 7,11,
@@ -7734,9 +7734,9 @@
 	 6, 8, 9,11,
 };
 
-static static_codebook _huff_book__44c3_s_short = {
+static const static_codebook _huff_book__44c3_s_short = {
 	2, 100,
-	_huff_lengthlist__44c3_s_short,
+	(long *)_huff_lengthlist__44c3_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -7745,7 +7745,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c4_s_long[] = {
+static const long _huff_lengthlist__44c4_s_long[] = {
 	 4, 7,11,11,11,11,10,11,12,11, 5, 2,11, 5, 6, 6,
 	 7, 9,11,12,11, 9, 6,10, 6, 7, 8, 9,10,11,11, 5,
 	11, 7, 8, 8, 9,11,13,14,11, 6, 5, 8, 4, 5, 7, 8,
@@ -7755,9 +7755,9 @@
 	 9, 8, 7, 7,
 };
 
-static static_codebook _huff_book__44c4_s_long = {
+static const static_codebook _huff_book__44c4_s_long = {
 	2, 100,
-	_huff_lengthlist__44c4_s_long,
+	(long *)_huff_lengthlist__44c4_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -7766,13 +7766,13 @@
 	0
 };
 
-static long _vq_quantlist__44c4_s_p1_0[] = {
+static const long _vq_quantlist__44c4_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c4_s_p1_0[] = {
+static const long _vq_lengthlist__44c4_s_p1_0[] = {
 	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0,
 	 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8186,33 +8186,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c4_s_p1_0[] = {
+static const float _vq_quantthresh__44c4_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c4_s_p1_0[] = {
+static const long _vq_quantmap__44c4_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p1_0 = {
-	_vq_quantthresh__44c4_s_p1_0,
-	_vq_quantmap__44c4_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p1_0 = {
+	(float *)_vq_quantthresh__44c4_s_p1_0,
+	(long *)_vq_quantmap__44c4_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c4_s_p1_0 = {
+static const static_codebook _44c4_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c4_s_p1_0,
+	(long *)_vq_lengthlist__44c4_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c4_s_p1_0,
+	(long *)_vq_quantlist__44c4_s_p1_0,
 	NULL,
-	&_vq_auxt__44c4_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p2_0[] = {
+static const long _vq_quantlist__44c4_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -8220,7 +8220,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c4_s_p2_0[] = {
+static const long _vq_lengthlist__44c4_s_p2_0[] = {
 	 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
 	 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7,
 	 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
@@ -8263,33 +8263,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c4_s_p2_0[] = {
+static const float _vq_quantthresh__44c4_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c4_s_p2_0[] = {
+static const long _vq_quantmap__44c4_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p2_0 = {
-	_vq_quantthresh__44c4_s_p2_0,
-	_vq_quantmap__44c4_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p2_0 = {
+	(float *)_vq_quantthresh__44c4_s_p2_0,
+	(long *)_vq_quantmap__44c4_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c4_s_p2_0 = {
+static const static_codebook _44c4_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c4_s_p2_0,
+	(long *)_vq_lengthlist__44c4_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c4_s_p2_0,
+	(long *)_vq_quantlist__44c4_s_p2_0,
 	NULL,
-	&_vq_auxt__44c4_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p3_0[] = {
+static const long _vq_quantlist__44c4_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -8297,7 +8297,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c4_s_p3_0[] = {
+static const long _vq_lengthlist__44c4_s_p3_0[] = {
 	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8340,33 +8340,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c4_s_p3_0[] = {
+static const float _vq_quantthresh__44c4_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c4_s_p3_0[] = {
+static const long _vq_quantmap__44c4_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p3_0 = {
-	_vq_quantthresh__44c4_s_p3_0,
-	_vq_quantmap__44c4_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p3_0 = {
+	(float *)_vq_quantthresh__44c4_s_p3_0,
+	(long *)_vq_quantmap__44c4_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _44c4_s_p3_0 = {
+static const static_codebook _44c4_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__44c4_s_p3_0,
+	(long *)_vq_lengthlist__44c4_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c4_s_p3_0,
+	(long *)_vq_quantlist__44c4_s_p3_0,
 	NULL,
-	&_vq_auxt__44c4_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p4_0[] = {
+static const long _vq_quantlist__44c4_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -8378,7 +8378,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c4_s_p4_0[] = {
+static const long _vq_lengthlist__44c4_s_p4_0[] = {
 	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
 	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
@@ -8387,34 +8387,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c4_s_p4_0[] = {
+static const float _vq_quantthresh__44c4_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c4_s_p4_0[] = {
+static const long _vq_quantmap__44c4_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p4_0 = {
-	_vq_quantthresh__44c4_s_p4_0,
-	_vq_quantmap__44c4_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p4_0 = {
+	(float *)_vq_quantthresh__44c4_s_p4_0,
+	(long *)_vq_quantmap__44c4_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c4_s_p4_0 = {
+static const static_codebook _44c4_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c4_s_p4_0,
+	(long *)_vq_lengthlist__44c4_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c4_s_p4_0,
+	(long *)_vq_quantlist__44c4_s_p4_0,
 	NULL,
-	&_vq_auxt__44c4_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p5_0[] = {
+static const long _vq_quantlist__44c4_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -8426,7 +8426,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c4_s_p5_0[] = {
+static const long _vq_lengthlist__44c4_s_p5_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7,
 	 9, 9, 0, 4, 5, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10, 9, 0, 0, 0,
@@ -8435,34 +8435,34 @@
 	10,
 };
 
-static float _vq_quantthresh__44c4_s_p5_0[] = {
+static const float _vq_quantthresh__44c4_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c4_s_p5_0[] = {
+static const long _vq_quantmap__44c4_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p5_0 = {
-	_vq_quantthresh__44c4_s_p5_0,
-	_vq_quantmap__44c4_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p5_0 = {
+	(float *)_vq_quantthresh__44c4_s_p5_0,
+	(long *)_vq_quantmap__44c4_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _44c4_s_p5_0 = {
+static const static_codebook _44c4_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__44c4_s_p5_0,
+	(long *)_vq_lengthlist__44c4_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c4_s_p5_0,
+	(long *)_vq_quantlist__44c4_s_p5_0,
 	NULL,
-	&_vq_auxt__44c4_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p6_0[] = {
+static const long _vq_quantlist__44c4_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -8482,7 +8482,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c4_s_p6_0[] = {
+static const long _vq_lengthlist__44c4_s_p6_0[] = {
 	 2, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,
 	11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	11,11, 0, 4, 4, 7, 6, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -8504,42 +8504,42 @@
 	13,
 };
 
-static float _vq_quantthresh__44c4_s_p6_0[] = {
+static const float _vq_quantthresh__44c4_s_p6_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__44c4_s_p6_0[] = {
+static const long _vq_quantmap__44c4_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p6_0 = {
-	_vq_quantthresh__44c4_s_p6_0,
-	_vq_quantmap__44c4_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p6_0 = {
+	(float *)_vq_quantthresh__44c4_s_p6_0,
+	(long *)_vq_quantmap__44c4_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _44c4_s_p6_0 = {
+static const static_codebook _44c4_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__44c4_s_p6_0,
+	(long *)_vq_lengthlist__44c4_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c4_s_p6_0,
+	(long *)_vq_quantlist__44c4_s_p6_0,
 	NULL,
-	&_vq_auxt__44c4_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p7_0[] = {
+static const long _vq_quantlist__44c4_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c4_s_p7_0[] = {
+static const long _vq_lengthlist__44c4_s_p7_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11,
 	10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
@@ -8548,33 +8548,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44c4_s_p7_0[] = {
+static const float _vq_quantthresh__44c4_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c4_s_p7_0[] = {
+static const long _vq_quantmap__44c4_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p7_0 = {
-	_vq_quantthresh__44c4_s_p7_0,
-	_vq_quantmap__44c4_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p7_0 = {
+	(float *)_vq_quantthresh__44c4_s_p7_0,
+	(long *)_vq_quantmap__44c4_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _44c4_s_p7_0 = {
+static const static_codebook _44c4_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__44c4_s_p7_0,
+	(long *)_vq_lengthlist__44c4_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c4_s_p7_0,
+	(long *)_vq_quantlist__44c4_s_p7_0,
 	NULL,
-	&_vq_auxt__44c4_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p7_1[] = {
+static const long _vq_quantlist__44c4_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -8588,7 +8588,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c4_s_p7_1[] = {
+static const long _vq_lengthlist__44c4_s_p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
@@ -8599,35 +8599,35 @@
 	10,10,10, 8, 8, 8, 8, 9, 9,
 };
 
-static float _vq_quantthresh__44c4_s_p7_1[] = {
+static const float _vq_quantthresh__44c4_s_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__44c4_s_p7_1[] = {
+static const long _vq_quantmap__44c4_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p7_1 = {
-	_vq_quantthresh__44c4_s_p7_1,
-	_vq_quantmap__44c4_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p7_1 = {
+	(float *)_vq_quantthresh__44c4_s_p7_1,
+	(long *)_vq_quantmap__44c4_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c4_s_p7_1 = {
+static const static_codebook _44c4_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c4_s_p7_1,
+	(long *)_vq_lengthlist__44c4_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c4_s_p7_1,
+	(long *)_vq_quantlist__44c4_s_p7_1,
 	NULL,
-	&_vq_auxt__44c4_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p8_0[] = {
+static const long _vq_quantlist__44c4_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -8643,7 +8643,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c4_s_p8_0[] = {
+static const long _vq_lengthlist__44c4_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -8657,35 +8657,35 @@
 	 0,13,12,12,12,12,12,13,13,
 };
 
-static float _vq_quantthresh__44c4_s_p8_0[] = {
+static const float _vq_quantthresh__44c4_s_p8_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__44c4_s_p8_0[] = {
+static const long _vq_quantmap__44c4_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p8_0 = {
-	_vq_quantthresh__44c4_s_p8_0,
-	_vq_quantmap__44c4_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p8_0 = {
+	(float *)_vq_quantthresh__44c4_s_p8_0,
+	(long *)_vq_quantmap__44c4_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c4_s_p8_0 = {
+static const static_codebook _44c4_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c4_s_p8_0,
+	(long *)_vq_lengthlist__44c4_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c4_s_p8_0,
+	(long *)_vq_quantlist__44c4_s_p8_0,
 	NULL,
-	&_vq_auxt__44c4_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p8_1[] = {
+static const long _vq_quantlist__44c4_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -8693,38 +8693,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c4_s_p8_1[] = {
+static const long _vq_lengthlist__44c4_s_p8_1[] = {
 	 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 5, 4, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c4_s_p8_1[] = {
+static const float _vq_quantthresh__44c4_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c4_s_p8_1[] = {
+static const long _vq_quantmap__44c4_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p8_1 = {
-	_vq_quantthresh__44c4_s_p8_1,
-	_vq_quantmap__44c4_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p8_1 = {
+	(float *)_vq_quantthresh__44c4_s_p8_1,
+	(long *)_vq_quantmap__44c4_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _44c4_s_p8_1 = {
+static const static_codebook _44c4_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__44c4_s_p8_1,
+	(long *)_vq_lengthlist__44c4_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c4_s_p8_1,
+	(long *)_vq_quantlist__44c4_s_p8_1,
 	NULL,
-	&_vq_auxt__44c4_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p9_0[] = {
+static const long _vq_quantlist__44c4_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -8740,7 +8740,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c4_s_p9_0[] = {
+static const long _vq_lengthlist__44c4_s_p9_0[] = {
 	 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 4, 7, 7,
 	12,12,12,12,12,12,12,12,12,12, 3, 8, 8,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@@ -8754,35 +8754,35 @@
 	12,12,12,12,12,12,12,12,12,
 };
 
-static float _vq_quantthresh__44c4_s_p9_0[] = {
+static const float _vq_quantthresh__44c4_s_p9_0[] = {
 	-1732.5, -1417.5, -1102.5, -787.5, -472.5, -157.5, 157.5, 472.5, 
 	787.5, 1102.5, 1417.5, 1732.5, 
 };
 
-static long _vq_quantmap__44c4_s_p9_0[] = {
+static const long _vq_quantmap__44c4_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p9_0 = {
-	_vq_quantthresh__44c4_s_p9_0,
-	_vq_quantmap__44c4_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p9_0 = {
+	(float *)_vq_quantthresh__44c4_s_p9_0,
+	(long *)_vq_quantmap__44c4_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _44c4_s_p9_0 = {
+static const static_codebook _44c4_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__44c4_s_p9_0,
+	(long *)_vq_lengthlist__44c4_s_p9_0,
 	1, -513964032, 1628680192, 4, 0,
-	_vq_quantlist__44c4_s_p9_0,
+	(long *)_vq_quantlist__44c4_s_p9_0,
 	NULL,
-	&_vq_auxt__44c4_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p9_1[] = {
+static const long _vq_quantlist__44c4_s_p9_1[] = {
 	7,
 	6,
 	8,
@@ -8800,7 +8800,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c4_s_p9_1[] = {
+static const long _vq_lengthlist__44c4_s_p9_1[] = {
 	 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,10,10, 6,
 	 5, 5, 7, 7, 9, 8,10, 9,11,10,12,12,13,13, 6, 5,
 	 5, 7, 7, 9, 9,10,10,11,11,12,12,12,13,19, 8, 8,
@@ -8818,35 +8818,35 @@
 	15,
 };
 
-static float _vq_quantthresh__44c4_s_p9_1[] = {
+static const float _vq_quantthresh__44c4_s_p9_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__44c4_s_p9_1[] = {
+static const long _vq_quantmap__44c4_s_p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c4_s_p9_1 = {
-	_vq_quantthresh__44c4_s_p9_1,
-	_vq_quantmap__44c4_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p9_1 = {
+	(float *)_vq_quantthresh__44c4_s_p9_1,
+	(long *)_vq_quantmap__44c4_s_p9_1,
 	15,
 	15
 };
 
-static static_codebook _44c4_s_p9_1 = {
+static const static_codebook _44c4_s_p9_1 = {
 	2, 225,
-	_vq_lengthlist__44c4_s_p9_1,
+	(long *)_vq_lengthlist__44c4_s_p9_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44c4_s_p9_1,
+	(long *)_vq_quantlist__44c4_s_p9_1,
 	NULL,
-	&_vq_auxt__44c4_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c4_s_p9_2[] = {
+static const long _vq_quantlist__44c4_s_p9_2[] = {
 	10,
 	9,
 	11,
@@ -8870,7 +8870,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44c4_s_p9_2[] = {
+static const long _vq_lengthlist__44c4_s_p9_2[] = {
 	 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8, 9, 9, 9, 9,11, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9,10,10,10,10,11, 6, 6, 7, 7, 8,
@@ -8901,37 +8901,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c4_s_p9_2[] = {
+static const float _vq_quantthresh__44c4_s_p9_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__44c4_s_p9_2[] = {
+static const long _vq_quantmap__44c4_s_p9_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__44c4_s_p9_2 = {
-	_vq_quantthresh__44c4_s_p9_2,
-	_vq_quantmap__44c4_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c4_s_p9_2 = {
+	(float *)_vq_quantthresh__44c4_s_p9_2,
+	(long *)_vq_quantmap__44c4_s_p9_2,
 	21,
 	21
 };
 
-static static_codebook _44c4_s_p9_2 = {
+static const static_codebook _44c4_s_p9_2 = {
 	2, 441,
-	_vq_lengthlist__44c4_s_p9_2,
+	(long *)_vq_lengthlist__44c4_s_p9_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44c4_s_p9_2,
+	(long *)_vq_quantlist__44c4_s_p9_2,
 	NULL,
-	&_vq_auxt__44c4_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c4_s_short[] = {
+static const long _huff_lengthlist__44c4_s_short[] = {
 	 4, 7,14,10,15,10,12,15,16,15, 4, 2,11, 5,10, 6,
 	 8,11,14,14,14,10, 7,11, 6, 8,10,11,13,15, 9, 4,
 	11, 5, 9, 6, 9,12,14,15,14, 9, 6, 9, 4, 5, 7,10,
@@ -8941,9 +8941,9 @@
 	 7, 9,12,17,
 };
 
-static static_codebook _huff_book__44c4_s_short = {
+static const static_codebook _huff_book__44c4_s_short = {
 	2, 100,
-	_huff_lengthlist__44c4_s_short,
+	(long *)_huff_lengthlist__44c4_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -8952,7 +8952,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c5_s_long[] = {
+static const long _huff_lengthlist__44c5_s_long[] = {
 	 3, 8, 9,13,10,12,12,12,12,12, 6, 4, 6, 8, 6, 8,
 	10,10,11,12, 8, 5, 4,10, 4, 7, 8, 9,10,11,13, 8,
 	10, 8, 9, 9,11,12,13,14,10, 6, 4, 9, 3, 5, 6, 8,
@@ -8962,9 +8962,9 @@
 	 9, 8, 7, 7,
 };
 
-static static_codebook _huff_book__44c5_s_long = {
+static const static_codebook _huff_book__44c5_s_long = {
 	2, 100,
-	_huff_lengthlist__44c5_s_long,
+	(long *)_huff_lengthlist__44c5_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -8973,13 +8973,13 @@
 	0
 };
 
-static long _vq_quantlist__44c5_s_p1_0[] = {
+static const long _vq_quantlist__44c5_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c5_s_p1_0[] = {
+static const long _vq_lengthlist__44c5_s_p1_0[] = {
 	 2, 4, 4, 0, 0, 0, 0, 0, 0, 4, 7, 7, 0, 0, 0, 0,
 	 0, 0, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9393,33 +9393,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c5_s_p1_0[] = {
+static const float _vq_quantthresh__44c5_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c5_s_p1_0[] = {
+static const long _vq_quantmap__44c5_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p1_0 = {
-	_vq_quantthresh__44c5_s_p1_0,
-	_vq_quantmap__44c5_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p1_0 = {
+	(float *)_vq_quantthresh__44c5_s_p1_0,
+	(long *)_vq_quantmap__44c5_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c5_s_p1_0 = {
+static const static_codebook _44c5_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c5_s_p1_0,
+	(long *)_vq_lengthlist__44c5_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c5_s_p1_0,
+	(long *)_vq_quantlist__44c5_s_p1_0,
 	NULL,
-	&_vq_auxt__44c5_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p2_0[] = {
+static const long _vq_quantlist__44c5_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -9427,7 +9427,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c5_s_p2_0[] = {
+static const long _vq_lengthlist__44c5_s_p2_0[] = {
 	 2, 4, 4, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
 	 8, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8,
 	 8, 0, 0, 0, 8, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
@@ -9470,33 +9470,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c5_s_p2_0[] = {
+static const float _vq_quantthresh__44c5_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c5_s_p2_0[] = {
+static const long _vq_quantmap__44c5_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p2_0 = {
-	_vq_quantthresh__44c5_s_p2_0,
-	_vq_quantmap__44c5_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p2_0 = {
+	(float *)_vq_quantthresh__44c5_s_p2_0,
+	(long *)_vq_quantmap__44c5_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c5_s_p2_0 = {
+static const static_codebook _44c5_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c5_s_p2_0,
+	(long *)_vq_lengthlist__44c5_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c5_s_p2_0,
+	(long *)_vq_quantlist__44c5_s_p2_0,
 	NULL,
-	&_vq_auxt__44c5_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p3_0[] = {
+static const long _vq_quantlist__44c5_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -9504,7 +9504,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c5_s_p3_0[] = {
+static const long _vq_lengthlist__44c5_s_p3_0[] = {
 	 2, 4, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9547,33 +9547,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c5_s_p3_0[] = {
+static const float _vq_quantthresh__44c5_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c5_s_p3_0[] = {
+static const long _vq_quantmap__44c5_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p3_0 = {
-	_vq_quantthresh__44c5_s_p3_0,
-	_vq_quantmap__44c5_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p3_0 = {
+	(float *)_vq_quantthresh__44c5_s_p3_0,
+	(long *)_vq_quantmap__44c5_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _44c5_s_p3_0 = {
+static const static_codebook _44c5_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__44c5_s_p3_0,
+	(long *)_vq_lengthlist__44c5_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c5_s_p3_0,
+	(long *)_vq_quantlist__44c5_s_p3_0,
 	NULL,
-	&_vq_auxt__44c5_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p4_0[] = {
+static const long _vq_quantlist__44c5_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -9585,7 +9585,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c5_s_p4_0[] = {
+static const long _vq_lengthlist__44c5_s_p4_0[] = {
 	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
 	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
@@ -9594,34 +9594,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c5_s_p4_0[] = {
+static const float _vq_quantthresh__44c5_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c5_s_p4_0[] = {
+static const long _vq_quantmap__44c5_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p4_0 = {
-	_vq_quantthresh__44c5_s_p4_0,
-	_vq_quantmap__44c5_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p4_0 = {
+	(float *)_vq_quantthresh__44c5_s_p4_0,
+	(long *)_vq_quantmap__44c5_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c5_s_p4_0 = {
+static const static_codebook _44c5_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c5_s_p4_0,
+	(long *)_vq_lengthlist__44c5_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c5_s_p4_0,
+	(long *)_vq_quantlist__44c5_s_p4_0,
 	NULL,
-	&_vq_auxt__44c5_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p5_0[] = {
+static const long _vq_quantlist__44c5_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -9633,7 +9633,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c5_s_p5_0[] = {
+static const long _vq_lengthlist__44c5_s_p5_0[] = {
 	 2, 4, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7,
 	 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7,
 	 7, 7, 9, 9, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0, 0,
@@ -9642,34 +9642,34 @@
 	10,
 };
 
-static float _vq_quantthresh__44c5_s_p5_0[] = {
+static const float _vq_quantthresh__44c5_s_p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c5_s_p5_0[] = {
+static const long _vq_quantmap__44c5_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p5_0 = {
-	_vq_quantthresh__44c5_s_p5_0,
-	_vq_quantmap__44c5_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p5_0 = {
+	(float *)_vq_quantthresh__44c5_s_p5_0,
+	(long *)_vq_quantmap__44c5_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _44c5_s_p5_0 = {
+static const static_codebook _44c5_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__44c5_s_p5_0,
+	(long *)_vq_lengthlist__44c5_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c5_s_p5_0,
+	(long *)_vq_quantlist__44c5_s_p5_0,
 	NULL,
-	&_vq_auxt__44c5_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p6_0[] = {
+static const long _vq_quantlist__44c5_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -9689,7 +9689,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c5_s_p6_0[] = {
+static const long _vq_lengthlist__44c5_s_p6_0[] = {
 	 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10,11,
 	11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -9711,42 +9711,42 @@
 	13,
 };
 
-static float _vq_quantthresh__44c5_s_p6_0[] = {
+static const float _vq_quantthresh__44c5_s_p6_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__44c5_s_p6_0[] = {
+static const long _vq_quantmap__44c5_s_p6_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p6_0 = {
-	_vq_quantthresh__44c5_s_p6_0,
-	_vq_quantmap__44c5_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p6_0 = {
+	(float *)_vq_quantthresh__44c5_s_p6_0,
+	(long *)_vq_quantmap__44c5_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _44c5_s_p6_0 = {
+static const static_codebook _44c5_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__44c5_s_p6_0,
+	(long *)_vq_lengthlist__44c5_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c5_s_p6_0,
+	(long *)_vq_quantlist__44c5_s_p6_0,
 	NULL,
-	&_vq_auxt__44c5_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p7_0[] = {
+static const long _vq_quantlist__44c5_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c5_s_p7_0[] = {
+static const long _vq_lengthlist__44c5_s_p7_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11,
 	10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
@@ -9755,33 +9755,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44c5_s_p7_0[] = {
+static const float _vq_quantthresh__44c5_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c5_s_p7_0[] = {
+static const long _vq_quantmap__44c5_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p7_0 = {
-	_vq_quantthresh__44c5_s_p7_0,
-	_vq_quantmap__44c5_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p7_0 = {
+	(float *)_vq_quantthresh__44c5_s_p7_0,
+	(long *)_vq_quantmap__44c5_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _44c5_s_p7_0 = {
+static const static_codebook _44c5_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__44c5_s_p7_0,
+	(long *)_vq_lengthlist__44c5_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c5_s_p7_0,
+	(long *)_vq_quantlist__44c5_s_p7_0,
 	NULL,
-	&_vq_auxt__44c5_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p7_1[] = {
+static const long _vq_quantlist__44c5_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -9795,7 +9795,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c5_s_p7_1[] = {
+static const long _vq_lengthlist__44c5_s_p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
@@ -9806,35 +9806,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c5_s_p7_1[] = {
+static const float _vq_quantthresh__44c5_s_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__44c5_s_p7_1[] = {
+static const long _vq_quantmap__44c5_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p7_1 = {
-	_vq_quantthresh__44c5_s_p7_1,
-	_vq_quantmap__44c5_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p7_1 = {
+	(float *)_vq_quantthresh__44c5_s_p7_1,
+	(long *)_vq_quantmap__44c5_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c5_s_p7_1 = {
+static const static_codebook _44c5_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c5_s_p7_1,
+	(long *)_vq_lengthlist__44c5_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c5_s_p7_1,
+	(long *)_vq_quantlist__44c5_s_p7_1,
 	NULL,
-	&_vq_auxt__44c5_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p8_0[] = {
+static const long _vq_quantlist__44c5_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -9850,7 +9850,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c5_s_p8_0[] = {
+static const long _vq_lengthlist__44c5_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 8, 9,10,10,10,10, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -9864,35 +9864,35 @@
 	 0,12,12,12,12,12,12,13,13,
 };
 
-static float _vq_quantthresh__44c5_s_p8_0[] = {
+static const float _vq_quantthresh__44c5_s_p8_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__44c5_s_p8_0[] = {
+static const long _vq_quantmap__44c5_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p8_0 = {
-	_vq_quantthresh__44c5_s_p8_0,
-	_vq_quantmap__44c5_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p8_0 = {
+	(float *)_vq_quantthresh__44c5_s_p8_0,
+	(long *)_vq_quantmap__44c5_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c5_s_p8_0 = {
+static const static_codebook _44c5_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c5_s_p8_0,
+	(long *)_vq_lengthlist__44c5_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c5_s_p8_0,
+	(long *)_vq_quantlist__44c5_s_p8_0,
 	NULL,
-	&_vq_auxt__44c5_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p8_1[] = {
+static const long _vq_quantlist__44c5_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -9900,38 +9900,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c5_s_p8_1[] = {
+static const long _vq_lengthlist__44c5_s_p8_1[] = {
 	 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c5_s_p8_1[] = {
+static const float _vq_quantthresh__44c5_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c5_s_p8_1[] = {
+static const long _vq_quantmap__44c5_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p8_1 = {
-	_vq_quantthresh__44c5_s_p8_1,
-	_vq_quantmap__44c5_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p8_1 = {
+	(float *)_vq_quantthresh__44c5_s_p8_1,
+	(long *)_vq_quantmap__44c5_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _44c5_s_p8_1 = {
+static const static_codebook _44c5_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__44c5_s_p8_1,
+	(long *)_vq_lengthlist__44c5_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c5_s_p8_1,
+	(long *)_vq_quantlist__44c5_s_p8_1,
 	NULL,
-	&_vq_auxt__44c5_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p9_0[] = {
+static const long _vq_quantlist__44c5_s_p9_0[] = {
 	7,
 	6,
 	8,
@@ -9949,7 +9949,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c5_s_p9_0[] = {
+static const long _vq_lengthlist__44c5_s_p9_0[] = {
 	 1, 3, 3,13,13,13,13,13,13,13,13,13,13,13,13, 4,
 	 7, 7,13,13,13,13,13,13,13,13,13,13,13,13, 3, 8,
 	 6,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
@@ -9967,35 +9967,35 @@
 	12,
 };
 
-static float _vq_quantthresh__44c5_s_p9_0[] = {
+static const float _vq_quantthresh__44c5_s_p9_0[] = {
 	-2320.5, -1963.5, -1606.5, -1249.5, -892.5, -535.5, -178.5, 178.5, 
 	535.5, 892.5, 1249.5, 1606.5, 1963.5, 2320.5, 
 };
 
-static long _vq_quantmap__44c5_s_p9_0[] = {
+static const long _vq_quantmap__44c5_s_p9_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p9_0 = {
-	_vq_quantthresh__44c5_s_p9_0,
-	_vq_quantmap__44c5_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p9_0 = {
+	(float *)_vq_quantthresh__44c5_s_p9_0,
+	(long *)_vq_quantmap__44c5_s_p9_0,
 	15,
 	15
 };
 
-static static_codebook _44c5_s_p9_0 = {
+static const static_codebook _44c5_s_p9_0 = {
 	2, 225,
-	_vq_lengthlist__44c5_s_p9_0,
+	(long *)_vq_lengthlist__44c5_s_p9_0,
 	1, -512522752, 1628852224, 4, 0,
-	_vq_quantlist__44c5_s_p9_0,
+	(long *)_vq_quantlist__44c5_s_p9_0,
 	NULL,
-	&_vq_auxt__44c5_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p9_1[] = {
+static const long _vq_quantlist__44c5_s_p9_1[] = {
 	8,
 	7,
 	9,
@@ -10015,7 +10015,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c5_s_p9_1[] = {
+static const long _vq_lengthlist__44c5_s_p9_1[] = {
 	 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,11,10,11,
 	11, 6, 5, 5, 7, 7, 8, 9,10,10,11,10,12,11,12,11,
 	13,12, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,13,
@@ -10037,36 +10037,36 @@
 	15,
 };
 
-static float _vq_quantthresh__44c5_s_p9_1[] = {
+static const float _vq_quantthresh__44c5_s_p9_1[] = {
 	-157.5, -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, 157.5, 
 };
 
-static long _vq_quantmap__44c5_s_p9_1[] = {
+static const long _vq_quantmap__44c5_s_p9_1[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c5_s_p9_1 = {
-	_vq_quantthresh__44c5_s_p9_1,
-	_vq_quantmap__44c5_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p9_1 = {
+	(float *)_vq_quantthresh__44c5_s_p9_1,
+	(long *)_vq_quantmap__44c5_s_p9_1,
 	17,
 	17
 };
 
-static static_codebook _44c5_s_p9_1 = {
+static const static_codebook _44c5_s_p9_1 = {
 	2, 289,
-	_vq_lengthlist__44c5_s_p9_1,
+	(long *)_vq_lengthlist__44c5_s_p9_1,
 	1, -520814592, 1620377600, 5, 0,
-	_vq_quantlist__44c5_s_p9_1,
+	(long *)_vq_quantlist__44c5_s_p9_1,
 	NULL,
-	&_vq_auxt__44c5_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c5_s_p9_2[] = {
+static const long _vq_quantlist__44c5_s_p9_2[] = {
 	10,
 	9,
 	11,
@@ -10090,7 +10090,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44c5_s_p9_2[] = {
+static const long _vq_lengthlist__44c5_s_p9_2[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 9,11, 5, 6, 7, 7, 8, 7, 8, 8, 8, 8,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11, 5, 5, 7, 7, 7,
@@ -10121,37 +10121,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c5_s_p9_2[] = {
+static const float _vq_quantthresh__44c5_s_p9_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__44c5_s_p9_2[] = {
+static const long _vq_quantmap__44c5_s_p9_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__44c5_s_p9_2 = {
-	_vq_quantthresh__44c5_s_p9_2,
-	_vq_quantmap__44c5_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c5_s_p9_2 = {
+	(float *)_vq_quantthresh__44c5_s_p9_2,
+	(long *)_vq_quantmap__44c5_s_p9_2,
 	21,
 	21
 };
 
-static static_codebook _44c5_s_p9_2 = {
+static const static_codebook _44c5_s_p9_2 = {
 	2, 441,
-	_vq_lengthlist__44c5_s_p9_2,
+	(long *)_vq_lengthlist__44c5_s_p9_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44c5_s_p9_2,
+	(long *)_vq_quantlist__44c5_s_p9_2,
 	NULL,
-	&_vq_auxt__44c5_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c5_s_short[] = {
+static const long _huff_lengthlist__44c5_s_short[] = {
 	 5, 8,10,14,11,11,12,16,15,17, 5, 5, 7, 9, 7, 8,
 	10,13,17,17, 7, 5, 5,10, 5, 7, 8,11,13,15,10, 8,
 	10, 8, 8, 8,11,15,18,18, 8, 5, 5, 8, 3, 4, 6,10,
@@ -10161,9 +10161,9 @@
 	 6, 8,11,16,
 };
 
-static static_codebook _huff_book__44c5_s_short = {
+static const static_codebook _huff_book__44c5_s_short = {
 	2, 100,
-	_huff_lengthlist__44c5_s_short,
+	(long *)_huff_lengthlist__44c5_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -10172,7 +10172,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c6_s_long[] = {
+static const long _huff_lengthlist__44c6_s_long[] = {
 	 3, 8,11,13,14,14,13,13,16,14, 6, 3, 4, 7, 9, 9,
 	10,11,14,13,10, 4, 3, 5, 7, 7, 9,10,13,15,12, 7,
 	 4, 4, 6, 6, 8,10,13,15,12, 8, 6, 6, 6, 6, 8,10,
@@ -10182,9 +10182,9 @@
 	11,10,10,12,
 };
 
-static static_codebook _huff_book__44c6_s_long = {
+static const static_codebook _huff_book__44c6_s_long = {
 	2, 100,
-	_huff_lengthlist__44c6_s_long,
+	(long *)_huff_lengthlist__44c6_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -10193,13 +10193,13 @@
 	0
 };
 
-static long _vq_quantlist__44c6_s_p1_0[] = {
+static const long _vq_quantlist__44c6_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c6_s_p1_0[] = {
+static const long _vq_lengthlist__44c6_s_p1_0[] = {
 	 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0,
 	 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9,
@@ -10208,33 +10208,33 @@
 	 8,
 };
 
-static float _vq_quantthresh__44c6_s_p1_0[] = {
+static const float _vq_quantthresh__44c6_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c6_s_p1_0[] = {
+static const long _vq_quantmap__44c6_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p1_0 = {
-	_vq_quantthresh__44c6_s_p1_0,
-	_vq_quantmap__44c6_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p1_0 = {
+	(float *)_vq_quantthresh__44c6_s_p1_0,
+	(long *)_vq_quantmap__44c6_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c6_s_p1_0 = {
+static const static_codebook _44c6_s_p1_0 = {
 	4, 81,
-	_vq_lengthlist__44c6_s_p1_0,
+	(long *)_vq_lengthlist__44c6_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c6_s_p1_0,
+	(long *)_vq_quantlist__44c6_s_p1_0,
 	NULL,
-	&_vq_auxt__44c6_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p2_0[] = {
+static const long _vq_quantlist__44c6_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -10242,7 +10242,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c6_s_p2_0[] = {
+static const long _vq_lengthlist__44c6_s_p2_0[] = {
 	 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0,
 	 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8,
 	 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0,
@@ -10285,33 +10285,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44c6_s_p2_0[] = {
+static const float _vq_quantthresh__44c6_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c6_s_p2_0[] = {
+static const long _vq_quantmap__44c6_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p2_0 = {
-	_vq_quantthresh__44c6_s_p2_0,
-	_vq_quantmap__44c6_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p2_0 = {
+	(float *)_vq_quantthresh__44c6_s_p2_0,
+	(long *)_vq_quantmap__44c6_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c6_s_p2_0 = {
+static const static_codebook _44c6_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c6_s_p2_0,
+	(long *)_vq_lengthlist__44c6_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c6_s_p2_0,
+	(long *)_vq_quantlist__44c6_s_p2_0,
 	NULL,
-	&_vq_auxt__44c6_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p3_0[] = {
+static const long _vq_quantlist__44c6_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -10323,7 +10323,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c6_s_p3_0[] = {
+static const long _vq_lengthlist__44c6_s_p3_0[] = {
 	 2, 3, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7,
 	 9,10, 0, 4, 4, 6, 6, 7, 7,10, 9, 0, 5, 5, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 6, 8, 8,10,10, 0, 0, 0,
@@ -10332,34 +10332,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c6_s_p3_0[] = {
+static const float _vq_quantthresh__44c6_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c6_s_p3_0[] = {
+static const long _vq_quantmap__44c6_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p3_0 = {
-	_vq_quantthresh__44c6_s_p3_0,
-	_vq_quantmap__44c6_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p3_0 = {
+	(float *)_vq_quantthresh__44c6_s_p3_0,
+	(long *)_vq_quantmap__44c6_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c6_s_p3_0 = {
+static const static_codebook _44c6_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c6_s_p3_0,
+	(long *)_vq_lengthlist__44c6_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c6_s_p3_0,
+	(long *)_vq_quantlist__44c6_s_p3_0,
 	NULL,
-	&_vq_auxt__44c6_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p4_0[] = {
+static const long _vq_quantlist__44c6_s_p4_0[] = {
 	8,
 	7,
 	9,
@@ -10379,7 +10379,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c6_s_p4_0[] = {
+static const long _vq_lengthlist__44c6_s_p4_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9,10,10,
 	10, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10,
 	11,11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -10401,42 +10401,42 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c6_s_p4_0[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p4_0[] = {
+static const long _vq_quantmap__44c6_s_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__44c6_s_p4_0 = {
-	_vq_quantthresh__44c6_s_p4_0,
-	_vq_quantmap__44c6_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p4_0 = {
+	(float *)_vq_quantthresh__44c6_s_p4_0,
+	(long *)_vq_quantmap__44c6_s_p4_0,
 	17,
 	17
 };
 
-static static_codebook _44c6_s_p4_0 = {
+static const static_codebook _44c6_s_p4_0 = {
 	2, 289,
-	_vq_lengthlist__44c6_s_p4_0,
+	(long *)_vq_lengthlist__44c6_s_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c6_s_p4_0,
+	(long *)_vq_quantlist__44c6_s_p4_0,
 	NULL,
-	&_vq_auxt__44c6_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p5_0[] = {
+static const long _vq_quantlist__44c6_s_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c6_s_p5_0[] = {
+static const long _vq_lengthlist__44c6_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6, 9, 9,10,10,
 	10, 9, 4, 6, 6, 9,10, 9,10, 9,10, 6, 9, 9,10,12,
 	11,10,11,11, 7,10, 9,11,12,12,12,12,12, 7,10,10,
@@ -10445,33 +10445,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44c6_s_p5_0[] = {
+static const float _vq_quantthresh__44c6_s_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c6_s_p5_0[] = {
+static const long _vq_quantmap__44c6_s_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p5_0 = {
-	_vq_quantthresh__44c6_s_p5_0,
-	_vq_quantmap__44c6_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p5_0 = {
+	(float *)_vq_quantthresh__44c6_s_p5_0,
+	(long *)_vq_quantmap__44c6_s_p5_0,
 	3,
 	3
 };
 
-static static_codebook _44c6_s_p5_0 = {
+static const static_codebook _44c6_s_p5_0 = {
 	4, 81,
-	_vq_lengthlist__44c6_s_p5_0,
+	(long *)_vq_lengthlist__44c6_s_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c6_s_p5_0,
+	(long *)_vq_quantlist__44c6_s_p5_0,
 	NULL,
-	&_vq_auxt__44c6_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p5_1[] = {
+static const long _vq_quantlist__44c6_s_p5_1[] = {
 	5,
 	4,
 	6,
@@ -10485,7 +10485,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c6_s_p5_1[] = {
+static const long _vq_lengthlist__44c6_s_p5_1[] = {
 	 3, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6,
 	 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 8,
 	 8,11, 6, 6, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6,
@@ -10496,35 +10496,35 @@
 	11,10,10, 7, 7, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c6_s_p5_1[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p5_1[] = {
+static const long _vq_quantmap__44c6_s_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p5_1 = {
-	_vq_quantthresh__44c6_s_p5_1,
-	_vq_quantmap__44c6_s_p5_1,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p5_1 = {
+	(float *)_vq_quantthresh__44c6_s_p5_1,
+	(long *)_vq_quantmap__44c6_s_p5_1,
 	11,
 	11
 };
 
-static static_codebook _44c6_s_p5_1 = {
+static const static_codebook _44c6_s_p5_1 = {
 	2, 121,
-	_vq_lengthlist__44c6_s_p5_1,
+	(long *)_vq_lengthlist__44c6_s_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c6_s_p5_1,
+	(long *)_vq_quantlist__44c6_s_p5_1,
 	NULL,
-	&_vq_auxt__44c6_s_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p6_0[] = {
+static const long _vq_quantlist__44c6_s_p6_0[] = {
 	6,
 	5,
 	7,
@@ -10540,7 +10540,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c6_s_p6_0[] = {
+static const long _vq_lengthlist__44c6_s_p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 8, 8,10, 9,10,10, 6, 5, 5,
 	 7, 7, 9, 9, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9,
 	 9,10, 9,11,10,11,11, 0, 6, 6, 7, 7, 9, 9,10,10,
@@ -10554,35 +10554,35 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__44c6_s_p6_0[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p6_0[] = {
+static const long _vq_quantmap__44c6_s_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p6_0 = {
-	_vq_quantthresh__44c6_s_p6_0,
-	_vq_quantmap__44c6_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p6_0 = {
+	(float *)_vq_quantthresh__44c6_s_p6_0,
+	(long *)_vq_quantmap__44c6_s_p6_0,
 	13,
 	13
 };
 
-static static_codebook _44c6_s_p6_0 = {
+static const static_codebook _44c6_s_p6_0 = {
 	2, 169,
-	_vq_lengthlist__44c6_s_p6_0,
+	(long *)_vq_lengthlist__44c6_s_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c6_s_p6_0,
+	(long *)_vq_quantlist__44c6_s_p6_0,
 	NULL,
-	&_vq_auxt__44c6_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p6_1[] = {
+static const long _vq_quantlist__44c6_s_p6_1[] = {
 	2,
 	1,
 	3,
@@ -10590,38 +10590,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c6_s_p6_1[] = {
+static const long _vq_lengthlist__44c6_s_p6_1[] = {
 	 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c6_s_p6_1[] = {
+static const float _vq_quantthresh__44c6_s_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c6_s_p6_1[] = {
+static const long _vq_quantmap__44c6_s_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p6_1 = {
-	_vq_quantthresh__44c6_s_p6_1,
-	_vq_quantmap__44c6_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p6_1 = {
+	(float *)_vq_quantthresh__44c6_s_p6_1,
+	(long *)_vq_quantmap__44c6_s_p6_1,
 	5,
 	5
 };
 
-static static_codebook _44c6_s_p6_1 = {
+static const static_codebook _44c6_s_p6_1 = {
 	2, 25,
-	_vq_lengthlist__44c6_s_p6_1,
+	(long *)_vq_lengthlist__44c6_s_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c6_s_p6_1,
+	(long *)_vq_quantlist__44c6_s_p6_1,
 	NULL,
-	&_vq_auxt__44c6_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p7_0[] = {
+static const long _vq_quantlist__44c6_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -10637,7 +10637,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c6_s_p7_0[] = {
+static const long _vq_lengthlist__44c6_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 8, 8,10,10,11,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,12,11,21, 7, 7, 7, 7, 9, 9,10,10,
@@ -10651,35 +10651,35 @@
 	20,13,13,13,13,13,13,14,14,
 };
 
-static float _vq_quantthresh__44c6_s_p7_0[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p7_0[] = {
+static const long _vq_quantmap__44c6_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p7_0 = {
-	_vq_quantthresh__44c6_s_p7_0,
-	_vq_quantmap__44c6_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p7_0 = {
+	(float *)_vq_quantthresh__44c6_s_p7_0,
+	(long *)_vq_quantmap__44c6_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c6_s_p7_0 = {
+static const static_codebook _44c6_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c6_s_p7_0,
+	(long *)_vq_lengthlist__44c6_s_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__44c6_s_p7_0,
+	(long *)_vq_quantlist__44c6_s_p7_0,
 	NULL,
-	&_vq_auxt__44c6_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p7_1[] = {
+static const long _vq_quantlist__44c6_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -10693,7 +10693,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c6_s_p7_1[] = {
+static const long _vq_lengthlist__44c6_s_p7_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 5, 5, 6, 6,
 	 7, 7, 7, 7, 8, 7, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7,
 	 7, 9, 6, 6, 7, 7, 7, 7, 8, 7, 7, 8, 9, 9, 9, 7,
@@ -10704,35 +10704,35 @@
 	 9, 8, 8, 7, 7, 7, 7, 8, 8,
 };
 
-static float _vq_quantthresh__44c6_s_p7_1[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p7_1[] = {
+static const long _vq_quantmap__44c6_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p7_1 = {
-	_vq_quantthresh__44c6_s_p7_1,
-	_vq_quantmap__44c6_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p7_1 = {
+	(float *)_vq_quantthresh__44c6_s_p7_1,
+	(long *)_vq_quantmap__44c6_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c6_s_p7_1 = {
+static const static_codebook _44c6_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c6_s_p7_1,
+	(long *)_vq_lengthlist__44c6_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c6_s_p7_1,
+	(long *)_vq_quantlist__44c6_s_p7_1,
 	NULL,
-	&_vq_auxt__44c6_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p8_0[] = {
+static const long _vq_quantlist__44c6_s_p8_0[] = {
 	7,
 	6,
 	8,
@@ -10750,7 +10750,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c6_s_p8_0[] = {
+static const long _vq_lengthlist__44c6_s_p8_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 7, 7, 8, 7, 9, 8,10, 9, 6,
 	 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,11,10,11,10, 6, 5,
 	 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11,18, 8, 8,
@@ -10768,35 +10768,35 @@
 	14,
 };
 
-static float _vq_quantthresh__44c6_s_p8_0[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p8_0[] = {
+static const long _vq_quantmap__44c6_s_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p8_0 = {
-	_vq_quantthresh__44c6_s_p8_0,
-	_vq_quantmap__44c6_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p8_0 = {
+	(float *)_vq_quantthresh__44c6_s_p8_0,
+	(long *)_vq_quantmap__44c6_s_p8_0,
 	15,
 	15
 };
 
-static static_codebook _44c6_s_p8_0 = {
+static const static_codebook _44c6_s_p8_0 = {
 	2, 225,
-	_vq_lengthlist__44c6_s_p8_0,
+	(long *)_vq_lengthlist__44c6_s_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44c6_s_p8_0,
+	(long *)_vq_quantlist__44c6_s_p8_0,
 	NULL,
-	&_vq_auxt__44c6_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p8_1[] = {
+static const long _vq_quantlist__44c6_s_p8_1[] = {
 	10,
 	9,
 	11,
@@ -10820,7 +10820,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44c6_s_p8_1[] = {
+static const long _vq_lengthlist__44c6_s_p8_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8,
@@ -10851,37 +10851,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c6_s_p8_1[] = {
+static const float _vq_quantthresh__44c6_s_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__44c6_s_p8_1[] = {
+static const long _vq_quantmap__44c6_s_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__44c6_s_p8_1 = {
-	_vq_quantthresh__44c6_s_p8_1,
-	_vq_quantmap__44c6_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p8_1 = {
+	(float *)_vq_quantthresh__44c6_s_p8_1,
+	(long *)_vq_quantmap__44c6_s_p8_1,
 	21,
 	21
 };
 
-static static_codebook _44c6_s_p8_1 = {
+static const static_codebook _44c6_s_p8_1 = {
 	2, 441,
-	_vq_lengthlist__44c6_s_p8_1,
+	(long *)_vq_lengthlist__44c6_s_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44c6_s_p8_1,
+	(long *)_vq_quantlist__44c6_s_p8_1,
 	NULL,
-	&_vq_auxt__44c6_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p9_0[] = {
+static const long _vq_quantlist__44c6_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -10897,7 +10897,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c6_s_p9_0[] = {
+static const long _vq_lengthlist__44c6_s_p9_0[] = {
 	 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 7, 7,
 	11,11,11,11,11,11,11,11,11,11, 5, 8, 9,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -10911,35 +10911,35 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c6_s_p9_0[] = {
+static const float _vq_quantthresh__44c6_s_p9_0[] = {
 	-3503.5, -2866.5, -2229.5, -1592.5, -955.5, -318.5, 318.5, 955.5, 
 	1592.5, 2229.5, 2866.5, 3503.5, 
 };
 
-static long _vq_quantmap__44c6_s_p9_0[] = {
+static const long _vq_quantmap__44c6_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p9_0 = {
-	_vq_quantthresh__44c6_s_p9_0,
-	_vq_quantmap__44c6_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p9_0 = {
+	(float *)_vq_quantthresh__44c6_s_p9_0,
+	(long *)_vq_quantmap__44c6_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _44c6_s_p9_0 = {
+static const static_codebook _44c6_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__44c6_s_p9_0,
+	(long *)_vq_lengthlist__44c6_s_p9_0,
 	1, -511845376, 1630791680, 4, 0,
-	_vq_quantlist__44c6_s_p9_0,
+	(long *)_vq_quantlist__44c6_s_p9_0,
 	NULL,
-	&_vq_auxt__44c6_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p9_1[] = {
+static const long _vq_quantlist__44c6_s_p9_1[] = {
 	6,
 	5,
 	7,
@@ -10955,7 +10955,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c6_s_p9_1[] = {
+static const long _vq_lengthlist__44c6_s_p9_1[] = {
 	 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6,
 	 8, 8, 8, 8, 8, 7, 9, 8,10,10, 5, 6, 6, 8, 8, 9,
 	 9, 8, 8,10,10,10,10,16, 9, 9, 9, 9, 9, 9, 9, 8,
@@ -10969,35 +10969,35 @@
 	15,12,10,11,11,13,11,12,13,
 };
 
-static float _vq_quantthresh__44c6_s_p9_1[] = {
+static const float _vq_quantthresh__44c6_s_p9_1[] = {
 	-269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 24.5, 73.5, 
 	122.5, 171.5, 220.5, 269.5, 
 };
 
-static long _vq_quantmap__44c6_s_p9_1[] = {
+static const long _vq_quantmap__44c6_s_p9_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p9_1 = {
-	_vq_quantthresh__44c6_s_p9_1,
-	_vq_quantmap__44c6_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p9_1 = {
+	(float *)_vq_quantthresh__44c6_s_p9_1,
+	(long *)_vq_quantmap__44c6_s_p9_1,
 	13,
 	13
 };
 
-static static_codebook _44c6_s_p9_1 = {
+static const static_codebook _44c6_s_p9_1 = {
 	2, 169,
-	_vq_lengthlist__44c6_s_p9_1,
+	(long *)_vq_lengthlist__44c6_s_p9_1,
 	1, -518889472, 1622704128, 4, 0,
-	_vq_quantlist__44c6_s_p9_1,
+	(long *)_vq_quantlist__44c6_s_p9_1,
 	NULL,
-	&_vq_auxt__44c6_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c6_s_p9_2[] = {
+static const long _vq_quantlist__44c6_s_p9_2[] = {
 	24,
 	23,
 	25,
@@ -11049,14 +11049,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44c6_s_p9_2[] = {
+static const long _vq_lengthlist__44c6_s_p9_2[] = {
 	 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 	 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7,
 };
 
-static float _vq_quantthresh__44c6_s_p9_2[] = {
+static const float _vq_quantthresh__44c6_s_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, 
@@ -11065,7 +11065,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44c6_s_p9_2[] = {
+static const long _vq_quantmap__44c6_s_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,
@@ -11075,25 +11075,25 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c6_s_p9_2 = {
-	_vq_quantthresh__44c6_s_p9_2,
-	_vq_quantmap__44c6_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c6_s_p9_2 = {
+	(float *)_vq_quantthresh__44c6_s_p9_2,
+	(long *)_vq_quantmap__44c6_s_p9_2,
 	49,
 	49
 };
 
-static static_codebook _44c6_s_p9_2 = {
+static const static_codebook _44c6_s_p9_2 = {
 	1, 49,
-	_vq_lengthlist__44c6_s_p9_2,
+	(long *)_vq_lengthlist__44c6_s_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44c6_s_p9_2,
+	(long *)_vq_quantlist__44c6_s_p9_2,
 	NULL,
-	&_vq_auxt__44c6_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c6_s_short[] = {
+static const long _huff_lengthlist__44c6_s_short[] = {
 	 3, 9,11,11,13,14,19,17,17,19, 5, 4, 5, 8,10,10,
 	13,16,18,19, 7, 4, 4, 5, 8, 9,12,14,17,19, 8, 6,
 	 5, 5, 7, 7,10,13,16,18,10, 8, 7, 6, 5, 5, 8,11,
@@ -11103,9 +11103,9 @@
 	 9,10,17,18,
 };
 
-static static_codebook _huff_book__44c6_s_short = {
+static const static_codebook _huff_book__44c6_s_short = {
 	2, 100,
-	_huff_lengthlist__44c6_s_short,
+	(long *)_huff_lengthlist__44c6_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -11114,7 +11114,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c7_s_long[] = {
+static const long _huff_lengthlist__44c7_s_long[] = {
 	 3, 8,11,13,15,14,14,13,15,14, 6, 4, 5, 7, 9,10,
 	11,11,14,13,10, 4, 3, 5, 7, 8, 9,10,13,13,12, 7,
 	 4, 4, 5, 6, 8, 9,12,14,13, 9, 6, 5, 5, 6, 8, 9,
@@ -11124,9 +11124,9 @@
 	11,10,10,12,
 };
 
-static static_codebook _huff_book__44c7_s_long = {
+static const static_codebook _huff_book__44c7_s_long = {
 	2, 100,
-	_huff_lengthlist__44c7_s_long,
+	(long *)_huff_lengthlist__44c7_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -11135,13 +11135,13 @@
 	0
 };
 
-static long _vq_quantlist__44c7_s_p1_0[] = {
+static const long _vq_quantlist__44c7_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c7_s_p1_0[] = {
+static const long _vq_lengthlist__44c7_s_p1_0[] = {
 	 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0,
 	 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 5, 9, 9, 0, 8, 8, 0, 8, 8, 5, 8, 9,
@@ -11150,33 +11150,33 @@
 	 8,
 };
 
-static float _vq_quantthresh__44c7_s_p1_0[] = {
+static const float _vq_quantthresh__44c7_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c7_s_p1_0[] = {
+static const long _vq_quantmap__44c7_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p1_0 = {
-	_vq_quantthresh__44c7_s_p1_0,
-	_vq_quantmap__44c7_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p1_0 = {
+	(float *)_vq_quantthresh__44c7_s_p1_0,
+	(long *)_vq_quantmap__44c7_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c7_s_p1_0 = {
+static const static_codebook _44c7_s_p1_0 = {
 	4, 81,
-	_vq_lengthlist__44c7_s_p1_0,
+	(long *)_vq_lengthlist__44c7_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c7_s_p1_0,
+	(long *)_vq_quantlist__44c7_s_p1_0,
 	NULL,
-	&_vq_auxt__44c7_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p2_0[] = {
+static const long _vq_quantlist__44c7_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -11184,7 +11184,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c7_s_p2_0[] = {
+static const long _vq_lengthlist__44c7_s_p2_0[] = {
 	 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0,
 	 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8,
 	 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0,
@@ -11227,33 +11227,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44c7_s_p2_0[] = {
+static const float _vq_quantthresh__44c7_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c7_s_p2_0[] = {
+static const long _vq_quantmap__44c7_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p2_0 = {
-	_vq_quantthresh__44c7_s_p2_0,
-	_vq_quantmap__44c7_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p2_0 = {
+	(float *)_vq_quantthresh__44c7_s_p2_0,
+	(long *)_vq_quantmap__44c7_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c7_s_p2_0 = {
+static const static_codebook _44c7_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c7_s_p2_0,
+	(long *)_vq_lengthlist__44c7_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c7_s_p2_0,
+	(long *)_vq_quantlist__44c7_s_p2_0,
 	NULL,
-	&_vq_auxt__44c7_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p3_0[] = {
+static const long _vq_quantlist__44c7_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -11265,7 +11265,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c7_s_p3_0[] = {
+static const long _vq_lengthlist__44c7_s_p3_0[] = {
 	 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7,
 	 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6,
 	 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
@@ -11274,34 +11274,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c7_s_p3_0[] = {
+static const float _vq_quantthresh__44c7_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c7_s_p3_0[] = {
+static const long _vq_quantmap__44c7_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p3_0 = {
-	_vq_quantthresh__44c7_s_p3_0,
-	_vq_quantmap__44c7_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p3_0 = {
+	(float *)_vq_quantthresh__44c7_s_p3_0,
+	(long *)_vq_quantmap__44c7_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c7_s_p3_0 = {
+static const static_codebook _44c7_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c7_s_p3_0,
+	(long *)_vq_lengthlist__44c7_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c7_s_p3_0,
+	(long *)_vq_quantlist__44c7_s_p3_0,
 	NULL,
-	&_vq_auxt__44c7_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p4_0[] = {
+static const long _vq_quantlist__44c7_s_p4_0[] = {
 	8,
 	7,
 	9,
@@ -11321,7 +11321,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c7_s_p4_0[] = {
+static const long _vq_lengthlist__44c7_s_p4_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,
 	12,12, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
@@ -11343,42 +11343,42 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c7_s_p4_0[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p4_0[] = {
+static const long _vq_quantmap__44c7_s_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__44c7_s_p4_0 = {
-	_vq_quantthresh__44c7_s_p4_0,
-	_vq_quantmap__44c7_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p4_0 = {
+	(float *)_vq_quantthresh__44c7_s_p4_0,
+	(long *)_vq_quantmap__44c7_s_p4_0,
 	17,
 	17
 };
 
-static static_codebook _44c7_s_p4_0 = {
+static const static_codebook _44c7_s_p4_0 = {
 	2, 289,
-	_vq_lengthlist__44c7_s_p4_0,
+	(long *)_vq_lengthlist__44c7_s_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c7_s_p4_0,
+	(long *)_vq_quantlist__44c7_s_p4_0,
 	NULL,
-	&_vq_auxt__44c7_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p5_0[] = {
+static const long _vq_quantlist__44c7_s_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c7_s_p5_0[] = {
+static const long _vq_lengthlist__44c7_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 7,10,10,10,10,
 	10, 9, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11,
 	12,10,11,12, 7,10,10,11,12,12,12,12,12, 7,10,10,
@@ -11387,33 +11387,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44c7_s_p5_0[] = {
+static const float _vq_quantthresh__44c7_s_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c7_s_p5_0[] = {
+static const long _vq_quantmap__44c7_s_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p5_0 = {
-	_vq_quantthresh__44c7_s_p5_0,
-	_vq_quantmap__44c7_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p5_0 = {
+	(float *)_vq_quantthresh__44c7_s_p5_0,
+	(long *)_vq_quantmap__44c7_s_p5_0,
 	3,
 	3
 };
 
-static static_codebook _44c7_s_p5_0 = {
+static const static_codebook _44c7_s_p5_0 = {
 	4, 81,
-	_vq_lengthlist__44c7_s_p5_0,
+	(long *)_vq_lengthlist__44c7_s_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c7_s_p5_0,
+	(long *)_vq_quantlist__44c7_s_p5_0,
 	NULL,
-	&_vq_auxt__44c7_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p5_1[] = {
+static const long _vq_quantlist__44c7_s_p5_1[] = {
 	5,
 	4,
 	6,
@@ -11427,7 +11427,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c7_s_p5_1[] = {
+static const long _vq_lengthlist__44c7_s_p5_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6,
 	 7, 7, 8, 8, 9, 9,11, 4, 4, 6, 6, 7, 7, 8, 8, 9,
 	 9,12, 5, 5, 6, 6, 7, 7, 9, 9, 9, 9,12,12,12, 6,
@@ -11438,35 +11438,35 @@
 	11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c7_s_p5_1[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p5_1[] = {
+static const long _vq_quantmap__44c7_s_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p5_1 = {
-	_vq_quantthresh__44c7_s_p5_1,
-	_vq_quantmap__44c7_s_p5_1,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p5_1 = {
+	(float *)_vq_quantthresh__44c7_s_p5_1,
+	(long *)_vq_quantmap__44c7_s_p5_1,
 	11,
 	11
 };
 
-static static_codebook _44c7_s_p5_1 = {
+static const static_codebook _44c7_s_p5_1 = {
 	2, 121,
-	_vq_lengthlist__44c7_s_p5_1,
+	(long *)_vq_lengthlist__44c7_s_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c7_s_p5_1,
+	(long *)_vq_quantlist__44c7_s_p5_1,
 	NULL,
-	&_vq_auxt__44c7_s_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p6_0[] = {
+static const long _vq_quantlist__44c7_s_p6_0[] = {
 	6,
 	5,
 	7,
@@ -11482,7 +11482,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c7_s_p6_0[] = {
+static const long _vq_lengthlist__44c7_s_p6_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 8,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9, 9,10,11,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 8, 9, 9,
@@ -11496,35 +11496,35 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__44c7_s_p6_0[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p6_0[] = {
+static const long _vq_quantmap__44c7_s_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p6_0 = {
-	_vq_quantthresh__44c7_s_p6_0,
-	_vq_quantmap__44c7_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p6_0 = {
+	(float *)_vq_quantthresh__44c7_s_p6_0,
+	(long *)_vq_quantmap__44c7_s_p6_0,
 	13,
 	13
 };
 
-static static_codebook _44c7_s_p6_0 = {
+static const static_codebook _44c7_s_p6_0 = {
 	2, 169,
-	_vq_lengthlist__44c7_s_p6_0,
+	(long *)_vq_lengthlist__44c7_s_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c7_s_p6_0,
+	(long *)_vq_quantlist__44c7_s_p6_0,
 	NULL,
-	&_vq_auxt__44c7_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p6_1[] = {
+static const long _vq_quantlist__44c7_s_p6_1[] = {
 	2,
 	1,
 	3,
@@ -11532,38 +11532,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c7_s_p6_1[] = {
+static const long _vq_lengthlist__44c7_s_p6_1[] = {
 	 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c7_s_p6_1[] = {
+static const float _vq_quantthresh__44c7_s_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c7_s_p6_1[] = {
+static const long _vq_quantmap__44c7_s_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p6_1 = {
-	_vq_quantthresh__44c7_s_p6_1,
-	_vq_quantmap__44c7_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p6_1 = {
+	(float *)_vq_quantthresh__44c7_s_p6_1,
+	(long *)_vq_quantmap__44c7_s_p6_1,
 	5,
 	5
 };
 
-static static_codebook _44c7_s_p6_1 = {
+static const static_codebook _44c7_s_p6_1 = {
 	2, 25,
-	_vq_lengthlist__44c7_s_p6_1,
+	(long *)_vq_lengthlist__44c7_s_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c7_s_p6_1,
+	(long *)_vq_quantlist__44c7_s_p6_1,
 	NULL,
-	&_vq_auxt__44c7_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p7_0[] = {
+static const long _vq_quantlist__44c7_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -11579,7 +11579,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c7_s_p7_0[] = {
+static const long _vq_lengthlist__44c7_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 8, 9, 9,10,10,12,11, 6, 5, 5,
 	 7, 7, 8, 8, 9,10,11,11,12,12, 7, 5, 5, 7, 7, 8,
 	 8,10,10,11,11,12,12,20, 7, 7, 7, 7, 8, 9,10,10,
@@ -11593,35 +11593,35 @@
 	19,13,13,13,13,14,14,15,15,
 };
 
-static float _vq_quantthresh__44c7_s_p7_0[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p7_0[] = {
+static const long _vq_quantmap__44c7_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p7_0 = {
-	_vq_quantthresh__44c7_s_p7_0,
-	_vq_quantmap__44c7_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p7_0 = {
+	(float *)_vq_quantthresh__44c7_s_p7_0,
+	(long *)_vq_quantmap__44c7_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c7_s_p7_0 = {
+static const static_codebook _44c7_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c7_s_p7_0,
+	(long *)_vq_lengthlist__44c7_s_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__44c7_s_p7_0,
+	(long *)_vq_quantlist__44c7_s_p7_0,
 	NULL,
-	&_vq_auxt__44c7_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p7_1[] = {
+static const long _vq_quantlist__44c7_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -11635,7 +11635,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c7_s_p7_1[] = {
+static const long _vq_lengthlist__44c7_s_p7_1[] = {
 	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7,
 	 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, 7, 7, 7, 7, 7,
 	 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7,
@@ -11646,35 +11646,35 @@
 	 8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
-static float _vq_quantthresh__44c7_s_p7_1[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p7_1[] = {
+static const long _vq_quantmap__44c7_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p7_1 = {
-	_vq_quantthresh__44c7_s_p7_1,
-	_vq_quantmap__44c7_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p7_1 = {
+	(float *)_vq_quantthresh__44c7_s_p7_1,
+	(long *)_vq_quantmap__44c7_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c7_s_p7_1 = {
+static const static_codebook _44c7_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c7_s_p7_1,
+	(long *)_vq_lengthlist__44c7_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c7_s_p7_1,
+	(long *)_vq_quantlist__44c7_s_p7_1,
 	NULL,
-	&_vq_auxt__44c7_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p8_0[] = {
+static const long _vq_quantlist__44c7_s_p8_0[] = {
 	7,
 	6,
 	8,
@@ -11692,7 +11692,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c7_s_p8_0[] = {
+static const long _vq_lengthlist__44c7_s_p8_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8, 9, 9,10,10, 6,
 	 5, 5, 7, 7, 9, 9, 8, 8,10, 9,11,10,12,11, 6, 5,
 	 5, 8, 7, 9, 9, 8, 8,10,10,11,11,12,11,19, 8, 8,
@@ -11710,35 +11710,35 @@
 	14,
 };
 
-static float _vq_quantthresh__44c7_s_p8_0[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p8_0[] = {
+static const long _vq_quantmap__44c7_s_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p8_0 = {
-	_vq_quantthresh__44c7_s_p8_0,
-	_vq_quantmap__44c7_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p8_0 = {
+	(float *)_vq_quantthresh__44c7_s_p8_0,
+	(long *)_vq_quantmap__44c7_s_p8_0,
 	15,
 	15
 };
 
-static static_codebook _44c7_s_p8_0 = {
+static const static_codebook _44c7_s_p8_0 = {
 	2, 225,
-	_vq_lengthlist__44c7_s_p8_0,
+	(long *)_vq_lengthlist__44c7_s_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44c7_s_p8_0,
+	(long *)_vq_quantlist__44c7_s_p8_0,
 	NULL,
-	&_vq_auxt__44c7_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p8_1[] = {
+static const long _vq_quantlist__44c7_s_p8_1[] = {
 	10,
 	9,
 	11,
@@ -11762,7 +11762,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44c7_s_p8_1[] = {
+static const long _vq_lengthlist__44c7_s_p8_1[] = {
 	 3, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8,
@@ -11793,37 +11793,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c7_s_p8_1[] = {
+static const float _vq_quantthresh__44c7_s_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__44c7_s_p8_1[] = {
+static const long _vq_quantmap__44c7_s_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__44c7_s_p8_1 = {
-	_vq_quantthresh__44c7_s_p8_1,
-	_vq_quantmap__44c7_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p8_1 = {
+	(float *)_vq_quantthresh__44c7_s_p8_1,
+	(long *)_vq_quantmap__44c7_s_p8_1,
 	21,
 	21
 };
 
-static static_codebook _44c7_s_p8_1 = {
+static const static_codebook _44c7_s_p8_1 = {
 	2, 441,
-	_vq_lengthlist__44c7_s_p8_1,
+	(long *)_vq_lengthlist__44c7_s_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44c7_s_p8_1,
+	(long *)_vq_quantlist__44c7_s_p8_1,
 	NULL,
-	&_vq_auxt__44c7_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p9_0[] = {
+static const long _vq_quantlist__44c7_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -11839,7 +11839,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c7_s_p9_0[] = {
+static const long _vq_lengthlist__44c7_s_p9_0[] = {
 	 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 6, 6,
 	11,11,11,11,11,11,11,11,11,11, 4, 7, 7,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -11853,35 +11853,35 @@
 	11,11,11,11,11,11,11,11,11,
 };
 
-static float _vq_quantthresh__44c7_s_p9_0[] = {
+static const float _vq_quantthresh__44c7_s_p9_0[] = {
 	-3503.5, -2866.5, -2229.5, -1592.5, -955.5, -318.5, 318.5, 955.5, 
 	1592.5, 2229.5, 2866.5, 3503.5, 
 };
 
-static long _vq_quantmap__44c7_s_p9_0[] = {
+static const long _vq_quantmap__44c7_s_p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p9_0 = {
-	_vq_quantthresh__44c7_s_p9_0,
-	_vq_quantmap__44c7_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p9_0 = {
+	(float *)_vq_quantthresh__44c7_s_p9_0,
+	(long *)_vq_quantmap__44c7_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _44c7_s_p9_0 = {
+static const static_codebook _44c7_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__44c7_s_p9_0,
+	(long *)_vq_lengthlist__44c7_s_p9_0,
 	1, -511845376, 1630791680, 4, 0,
-	_vq_quantlist__44c7_s_p9_0,
+	(long *)_vq_quantlist__44c7_s_p9_0,
 	NULL,
-	&_vq_auxt__44c7_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p9_1[] = {
+static const long _vq_quantlist__44c7_s_p9_1[] = {
 	6,
 	5,
 	7,
@@ -11897,7 +11897,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c7_s_p9_1[] = {
+static const long _vq_lengthlist__44c7_s_p9_1[] = {
 	 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6,
 	 8, 8, 9, 8, 8, 7, 9, 8,11,10, 5, 6, 6, 8, 8, 9,
 	 8, 8, 8,10, 9,11,11,16, 8, 8, 9, 8, 9, 9, 9, 8,
@@ -11911,35 +11911,35 @@
 	15,11,11,10,10,12,12,12,12,
 };
 
-static float _vq_quantthresh__44c7_s_p9_1[] = {
+static const float _vq_quantthresh__44c7_s_p9_1[] = {
 	-269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 24.5, 73.5, 
 	122.5, 171.5, 220.5, 269.5, 
 };
 
-static long _vq_quantmap__44c7_s_p9_1[] = {
+static const long _vq_quantmap__44c7_s_p9_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p9_1 = {
-	_vq_quantthresh__44c7_s_p9_1,
-	_vq_quantmap__44c7_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p9_1 = {
+	(float *)_vq_quantthresh__44c7_s_p9_1,
+	(long *)_vq_quantmap__44c7_s_p9_1,
 	13,
 	13
 };
 
-static static_codebook _44c7_s_p9_1 = {
+static const static_codebook _44c7_s_p9_1 = {
 	2, 169,
-	_vq_lengthlist__44c7_s_p9_1,
+	(long *)_vq_lengthlist__44c7_s_p9_1,
 	1, -518889472, 1622704128, 4, 0,
-	_vq_quantlist__44c7_s_p9_1,
+	(long *)_vq_quantlist__44c7_s_p9_1,
 	NULL,
-	&_vq_auxt__44c7_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c7_s_p9_2[] = {
+static const long _vq_quantlist__44c7_s_p9_2[] = {
 	24,
 	23,
 	25,
@@ -11991,14 +11991,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44c7_s_p9_2[] = {
+static const long _vq_lengthlist__44c7_s_p9_2[] = {
 	 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 	 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7,
 };
 
-static float _vq_quantthresh__44c7_s_p9_2[] = {
+static const float _vq_quantthresh__44c7_s_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, 
@@ -12007,7 +12007,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44c7_s_p9_2[] = {
+static const long _vq_quantmap__44c7_s_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,
@@ -12017,25 +12017,25 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c7_s_p9_2 = {
-	_vq_quantthresh__44c7_s_p9_2,
-	_vq_quantmap__44c7_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c7_s_p9_2 = {
+	(float *)_vq_quantthresh__44c7_s_p9_2,
+	(long *)_vq_quantmap__44c7_s_p9_2,
 	49,
 	49
 };
 
-static static_codebook _44c7_s_p9_2 = {
+static const static_codebook _44c7_s_p9_2 = {
 	1, 49,
-	_vq_lengthlist__44c7_s_p9_2,
+	(long *)_vq_lengthlist__44c7_s_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44c7_s_p9_2,
+	(long *)_vq_quantlist__44c7_s_p9_2,
 	NULL,
-	&_vq_auxt__44c7_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c7_s_short[] = {
+static const long _huff_lengthlist__44c7_s_short[] = {
 	 4,11,12,14,15,15,17,17,18,18, 5, 6, 6, 8, 9,10,
 	13,17,18,19, 7, 5, 4, 6, 8, 9,11,15,19,19, 8, 6,
 	 5, 5, 6, 7,11,14,16,17, 9, 7, 7, 6, 7, 7,10,13,
@@ -12045,9 +12045,9 @@
 	10, 9,11,14,
 };
 
-static static_codebook _huff_book__44c7_s_short = {
+static const static_codebook _huff_book__44c7_s_short = {
 	2, 100,
-	_huff_lengthlist__44c7_s_short,
+	(long *)_huff_lengthlist__44c7_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -12056,7 +12056,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c8_s_long[] = {
+static const long _huff_lengthlist__44c8_s_long[] = {
 	 3, 8,12,13,14,14,14,13,14,14, 6, 4, 5, 8,10,10,
 	11,11,14,13, 9, 5, 4, 5, 7, 8, 9,10,13,13,12, 7,
 	 5, 4, 5, 6, 8, 9,12,13,13, 9, 6, 5, 5, 5, 7, 9,
@@ -12066,9 +12066,9 @@
 	11, 9, 9,10,
 };
 
-static static_codebook _huff_book__44c8_s_long = {
+static const static_codebook _huff_book__44c8_s_long = {
 	2, 100,
-	_huff_lengthlist__44c8_s_long,
+	(long *)_huff_lengthlist__44c8_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -12077,13 +12077,13 @@
 	0
 };
 
-static long _vq_quantlist__44c8_s_p1_0[] = {
+static const long _vq_quantlist__44c8_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c8_s_p1_0[] = {
+static const long _vq_lengthlist__44c8_s_p1_0[] = {
 	 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 7, 7, 0, 9, 8, 0,
 	 9, 8, 6, 7, 7, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9,
@@ -12092,33 +12092,33 @@
 	 8,
 };
 
-static float _vq_quantthresh__44c8_s_p1_0[] = {
+static const float _vq_quantthresh__44c8_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c8_s_p1_0[] = {
+static const long _vq_quantmap__44c8_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p1_0 = {
-	_vq_quantthresh__44c8_s_p1_0,
-	_vq_quantmap__44c8_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p1_0 = {
+	(float *)_vq_quantthresh__44c8_s_p1_0,
+	(long *)_vq_quantmap__44c8_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c8_s_p1_0 = {
+static const static_codebook _44c8_s_p1_0 = {
 	4, 81,
-	_vq_lengthlist__44c8_s_p1_0,
+	(long *)_vq_lengthlist__44c8_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c8_s_p1_0,
+	(long *)_vq_quantlist__44c8_s_p1_0,
 	NULL,
-	&_vq_auxt__44c8_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p2_0[] = {
+static const long _vq_quantlist__44c8_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -12126,7 +12126,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c8_s_p2_0[] = {
+static const long _vq_lengthlist__44c8_s_p2_0[] = {
 	 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0,
 	 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8,
 	 7,10, 9, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0,
@@ -12169,33 +12169,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44c8_s_p2_0[] = {
+static const float _vq_quantthresh__44c8_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c8_s_p2_0[] = {
+static const long _vq_quantmap__44c8_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p2_0 = {
-	_vq_quantthresh__44c8_s_p2_0,
-	_vq_quantmap__44c8_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p2_0 = {
+	(float *)_vq_quantthresh__44c8_s_p2_0,
+	(long *)_vq_quantmap__44c8_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c8_s_p2_0 = {
+static const static_codebook _44c8_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c8_s_p2_0,
+	(long *)_vq_lengthlist__44c8_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c8_s_p2_0,
+	(long *)_vq_quantlist__44c8_s_p2_0,
 	NULL,
-	&_vq_auxt__44c8_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p3_0[] = {
+static const long _vq_quantlist__44c8_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -12207,7 +12207,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c8_s_p3_0[] = {
+static const long _vq_lengthlist__44c8_s_p3_0[] = {
 	 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7,
 	 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6,
 	 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
@@ -12216,34 +12216,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c8_s_p3_0[] = {
+static const float _vq_quantthresh__44c8_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c8_s_p3_0[] = {
+static const long _vq_quantmap__44c8_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p3_0 = {
-	_vq_quantthresh__44c8_s_p3_0,
-	_vq_quantmap__44c8_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p3_0 = {
+	(float *)_vq_quantthresh__44c8_s_p3_0,
+	(long *)_vq_quantmap__44c8_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c8_s_p3_0 = {
+static const static_codebook _44c8_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c8_s_p3_0,
+	(long *)_vq_lengthlist__44c8_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c8_s_p3_0,
+	(long *)_vq_quantlist__44c8_s_p3_0,
 	NULL,
-	&_vq_auxt__44c8_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p4_0[] = {
+static const long _vq_quantlist__44c8_s_p4_0[] = {
 	8,
 	7,
 	9,
@@ -12263,7 +12263,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c8_s_p4_0[] = {
+static const long _vq_lengthlist__44c8_s_p4_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8,10,10,11,11,
 	11,11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
@@ -12285,42 +12285,42 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c8_s_p4_0[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p4_0[] = {
+static const long _vq_quantmap__44c8_s_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__44c8_s_p4_0 = {
-	_vq_quantthresh__44c8_s_p4_0,
-	_vq_quantmap__44c8_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p4_0 = {
+	(float *)_vq_quantthresh__44c8_s_p4_0,
+	(long *)_vq_quantmap__44c8_s_p4_0,
 	17,
 	17
 };
 
-static static_codebook _44c8_s_p4_0 = {
+static const static_codebook _44c8_s_p4_0 = {
 	2, 289,
-	_vq_lengthlist__44c8_s_p4_0,
+	(long *)_vq_lengthlist__44c8_s_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c8_s_p4_0,
+	(long *)_vq_quantlist__44c8_s_p4_0,
 	NULL,
-	&_vq_auxt__44c8_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p5_0[] = {
+static const long _vq_quantlist__44c8_s_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c8_s_p5_0[] = {
+static const long _vq_lengthlist__44c8_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6,10,10,10,10,
 	10,10, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11,
 	11,10,11,11, 7,10,10,11,12,12,12,12,12, 7,10,10,
@@ -12329,33 +12329,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44c8_s_p5_0[] = {
+static const float _vq_quantthresh__44c8_s_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c8_s_p5_0[] = {
+static const long _vq_quantmap__44c8_s_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p5_0 = {
-	_vq_quantthresh__44c8_s_p5_0,
-	_vq_quantmap__44c8_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p5_0 = {
+	(float *)_vq_quantthresh__44c8_s_p5_0,
+	(long *)_vq_quantmap__44c8_s_p5_0,
 	3,
 	3
 };
 
-static static_codebook _44c8_s_p5_0 = {
+static const static_codebook _44c8_s_p5_0 = {
 	4, 81,
-	_vq_lengthlist__44c8_s_p5_0,
+	(long *)_vq_lengthlist__44c8_s_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c8_s_p5_0,
+	(long *)_vq_quantlist__44c8_s_p5_0,
 	NULL,
-	&_vq_auxt__44c8_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p5_1[] = {
+static const long _vq_quantlist__44c8_s_p5_1[] = {
 	5,
 	4,
 	6,
@@ -12369,7 +12369,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c8_s_p5_1[] = {
+static const long _vq_lengthlist__44c8_s_p5_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 9,12, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,12,12,12, 6,
@@ -12380,35 +12380,35 @@
 	11,11,11, 7, 7, 7, 7, 8, 8,
 };
 
-static float _vq_quantthresh__44c8_s_p5_1[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p5_1[] = {
+static const long _vq_quantmap__44c8_s_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p5_1 = {
-	_vq_quantthresh__44c8_s_p5_1,
-	_vq_quantmap__44c8_s_p5_1,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p5_1 = {
+	(float *)_vq_quantthresh__44c8_s_p5_1,
+	(long *)_vq_quantmap__44c8_s_p5_1,
 	11,
 	11
 };
 
-static static_codebook _44c8_s_p5_1 = {
+static const static_codebook _44c8_s_p5_1 = {
 	2, 121,
-	_vq_lengthlist__44c8_s_p5_1,
+	(long *)_vq_lengthlist__44c8_s_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c8_s_p5_1,
+	(long *)_vq_quantlist__44c8_s_p5_1,
 	NULL,
-	&_vq_auxt__44c8_s_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p6_0[] = {
+static const long _vq_quantlist__44c8_s_p6_0[] = {
 	6,
 	5,
 	7,
@@ -12424,7 +12424,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c8_s_p6_0[] = {
+static const long _vq_lengthlist__44c8_s_p6_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 9,10,10,
@@ -12438,35 +12438,35 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__44c8_s_p6_0[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p6_0[] = {
+static const long _vq_quantmap__44c8_s_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p6_0 = {
-	_vq_quantthresh__44c8_s_p6_0,
-	_vq_quantmap__44c8_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p6_0 = {
+	(float *)_vq_quantthresh__44c8_s_p6_0,
+	(long *)_vq_quantmap__44c8_s_p6_0,
 	13,
 	13
 };
 
-static static_codebook _44c8_s_p6_0 = {
+static const static_codebook _44c8_s_p6_0 = {
 	2, 169,
-	_vq_lengthlist__44c8_s_p6_0,
+	(long *)_vq_lengthlist__44c8_s_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c8_s_p6_0,
+	(long *)_vq_quantlist__44c8_s_p6_0,
 	NULL,
-	&_vq_auxt__44c8_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p6_1[] = {
+static const long _vq_quantlist__44c8_s_p6_1[] = {
 	2,
 	1,
 	3,
@@ -12474,38 +12474,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c8_s_p6_1[] = {
+static const long _vq_lengthlist__44c8_s_p6_1[] = {
 	 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c8_s_p6_1[] = {
+static const float _vq_quantthresh__44c8_s_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c8_s_p6_1[] = {
+static const long _vq_quantmap__44c8_s_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p6_1 = {
-	_vq_quantthresh__44c8_s_p6_1,
-	_vq_quantmap__44c8_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p6_1 = {
+	(float *)_vq_quantthresh__44c8_s_p6_1,
+	(long *)_vq_quantmap__44c8_s_p6_1,
 	5,
 	5
 };
 
-static static_codebook _44c8_s_p6_1 = {
+static const static_codebook _44c8_s_p6_1 = {
 	2, 25,
-	_vq_lengthlist__44c8_s_p6_1,
+	(long *)_vq_lengthlist__44c8_s_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c8_s_p6_1,
+	(long *)_vq_quantlist__44c8_s_p6_1,
 	NULL,
-	&_vq_auxt__44c8_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p7_0[] = {
+static const long _vq_quantlist__44c8_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -12521,7 +12521,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c8_s_p7_0[] = {
+static const long _vq_lengthlist__44c8_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 8, 7, 9, 9,10,10,12,12, 6, 5, 5,
 	 7, 7, 8, 8,10,10,11,11,12,12, 7, 5, 5, 7, 7, 8,
 	 8,10,10,11,11,12,12,21, 7, 7, 7, 7, 8, 9,10,10,
@@ -12535,35 +12535,35 @@
 	20,13,13,13,13,14,13,15,15,
 };
 
-static float _vq_quantthresh__44c8_s_p7_0[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p7_0[] = {
+static const long _vq_quantmap__44c8_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p7_0 = {
-	_vq_quantthresh__44c8_s_p7_0,
-	_vq_quantmap__44c8_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p7_0 = {
+	(float *)_vq_quantthresh__44c8_s_p7_0,
+	(long *)_vq_quantmap__44c8_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c8_s_p7_0 = {
+static const static_codebook _44c8_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c8_s_p7_0,
+	(long *)_vq_lengthlist__44c8_s_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__44c8_s_p7_0,
+	(long *)_vq_quantlist__44c8_s_p7_0,
 	NULL,
-	&_vq_auxt__44c8_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p7_1[] = {
+static const long _vq_quantlist__44c8_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -12577,7 +12577,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c8_s_p7_1[] = {
+static const long _vq_lengthlist__44c8_s_p7_1[] = {
 	 4, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7,
 	 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7,
 	 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7,
@@ -12588,35 +12588,35 @@
 	 8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
-static float _vq_quantthresh__44c8_s_p7_1[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p7_1[] = {
+static const long _vq_quantmap__44c8_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p7_1 = {
-	_vq_quantthresh__44c8_s_p7_1,
-	_vq_quantmap__44c8_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p7_1 = {
+	(float *)_vq_quantthresh__44c8_s_p7_1,
+	(long *)_vq_quantmap__44c8_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c8_s_p7_1 = {
+static const static_codebook _44c8_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c8_s_p7_1,
+	(long *)_vq_lengthlist__44c8_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c8_s_p7_1,
+	(long *)_vq_quantlist__44c8_s_p7_1,
 	NULL,
-	&_vq_auxt__44c8_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p8_0[] = {
+static const long _vq_quantlist__44c8_s_p8_0[] = {
 	7,
 	6,
 	8,
@@ -12634,7 +12634,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c8_s_p8_0[] = {
+static const long _vq_lengthlist__44c8_s_p8_0[] = {
 	 1, 4, 4, 7, 6, 8, 8, 8, 7, 9, 8,10,10,11,10, 6,
 	 5, 5, 7, 7, 9, 9, 8, 8,10,10,11,11,12,11, 6, 5,
 	 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,20, 8, 8,
@@ -12652,35 +12652,35 @@
 	15,
 };
 
-static float _vq_quantthresh__44c8_s_p8_0[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p8_0[] = {
+static const long _vq_quantmap__44c8_s_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p8_0 = {
-	_vq_quantthresh__44c8_s_p8_0,
-	_vq_quantmap__44c8_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p8_0 = {
+	(float *)_vq_quantthresh__44c8_s_p8_0,
+	(long *)_vq_quantmap__44c8_s_p8_0,
 	15,
 	15
 };
 
-static static_codebook _44c8_s_p8_0 = {
+static const static_codebook _44c8_s_p8_0 = {
 	2, 225,
-	_vq_lengthlist__44c8_s_p8_0,
+	(long *)_vq_lengthlist__44c8_s_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44c8_s_p8_0,
+	(long *)_vq_quantlist__44c8_s_p8_0,
 	NULL,
-	&_vq_auxt__44c8_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p8_1[] = {
+static const long _vq_quantlist__44c8_s_p8_1[] = {
 	10,
 	9,
 	11,
@@ -12704,7 +12704,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44c8_s_p8_1[] = {
+static const long _vq_lengthlist__44c8_s_p8_1[] = {
 	 4, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8,
@@ -12735,37 +12735,37 @@
 	10, 9, 9,10,10, 9,10, 9, 9,
 };
 
-static float _vq_quantthresh__44c8_s_p8_1[] = {
+static const float _vq_quantthresh__44c8_s_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__44c8_s_p8_1[] = {
+static const long _vq_quantmap__44c8_s_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__44c8_s_p8_1 = {
-	_vq_quantthresh__44c8_s_p8_1,
-	_vq_quantmap__44c8_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p8_1 = {
+	(float *)_vq_quantthresh__44c8_s_p8_1,
+	(long *)_vq_quantmap__44c8_s_p8_1,
 	21,
 	21
 };
 
-static static_codebook _44c8_s_p8_1 = {
+static const static_codebook _44c8_s_p8_1 = {
 	2, 441,
-	_vq_lengthlist__44c8_s_p8_1,
+	(long *)_vq_lengthlist__44c8_s_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44c8_s_p8_1,
+	(long *)_vq_quantlist__44c8_s_p8_1,
 	NULL,
-	&_vq_auxt__44c8_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p9_0[] = {
+static const long _vq_quantlist__44c8_s_p9_0[] = {
 	8,
 	7,
 	9,
@@ -12785,7 +12785,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c8_s_p9_0[] = {
+static const long _vq_lengthlist__44c8_s_p9_0[] = {
 	 1, 4, 3,11,11,11,11,11,11,11,11,11,11,11,11,11,
 	11, 4, 7, 7,11,11,11,11,11,11,11,11,11,11,11,11,
 	11,11, 4, 8,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -12807,36 +12807,36 @@
 	10,
 };
 
-static float _vq_quantthresh__44c8_s_p9_0[] = {
+static const float _vq_quantthresh__44c8_s_p9_0[] = {
 	-6982.5, -6051.5, -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -465.5, 
 	465.5, 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 6051.5, 6982.5, 
 };
 
-static long _vq_quantmap__44c8_s_p9_0[] = {
+static const long _vq_quantmap__44c8_s_p9_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p9_0 = {
-	_vq_quantthresh__44c8_s_p9_0,
-	_vq_quantmap__44c8_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p9_0 = {
+	(float *)_vq_quantthresh__44c8_s_p9_0,
+	(long *)_vq_quantmap__44c8_s_p9_0,
 	17,
 	17
 };
 
-static static_codebook _44c8_s_p9_0 = {
+static const static_codebook _44c8_s_p9_0 = {
 	2, 289,
-	_vq_lengthlist__44c8_s_p9_0,
+	(long *)_vq_lengthlist__44c8_s_p9_0,
 	1, -509798400, 1631393792, 5, 0,
-	_vq_quantlist__44c8_s_p9_0,
+	(long *)_vq_quantlist__44c8_s_p9_0,
 	NULL,
-	&_vq_auxt__44c8_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p9_1[] = {
+static const long _vq_quantlist__44c8_s_p9_1[] = {
 	9,
 	8,
 	10,
@@ -12858,7 +12858,7 @@
 	18,
 };
 
-static long _vq_lengthlist__44c8_s_p9_1[] = {
+static const long _vq_lengthlist__44c8_s_p9_1[] = {
 	 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,10,
 	10,11,11, 6, 6, 6, 8, 8, 9, 8, 8, 7,10, 8,11,10,
 	12,11,12,12,13,13, 5, 5, 6, 8, 8, 9, 9, 8, 8,10,
@@ -12884,37 +12884,37 @@
 	14,13,13,14,14,15,14,15,14,
 };
 
-static float _vq_quantthresh__44c8_s_p9_1[] = {
+static const float _vq_quantthresh__44c8_s_p9_1[] = {
 	-416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, 
 	-24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, 
 	367.5, 416.5, 
 };
 
-static long _vq_quantmap__44c8_s_p9_1[] = {
+static const long _vq_quantmap__44c8_s_p9_1[] = {
 	   17,   15,   13,   11,    9,    7,    5,    3,
 	    1,    0,    2,    4,    6,    8,   10,   12,
 	   14,   16,   18,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p9_1 = {
-	_vq_quantthresh__44c8_s_p9_1,
-	_vq_quantmap__44c8_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p9_1 = {
+	(float *)_vq_quantthresh__44c8_s_p9_1,
+	(long *)_vq_quantmap__44c8_s_p9_1,
 	19,
 	19
 };
 
-static static_codebook _44c8_s_p9_1 = {
+static const static_codebook _44c8_s_p9_1 = {
 	2, 361,
-	_vq_lengthlist__44c8_s_p9_1,
+	(long *)_vq_lengthlist__44c8_s_p9_1,
 	1, -518287360, 1622704128, 5, 0,
-	_vq_quantlist__44c8_s_p9_1,
+	(long *)_vq_quantlist__44c8_s_p9_1,
 	NULL,
-	&_vq_auxt__44c8_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c8_s_p9_2[] = {
+static const long _vq_quantlist__44c8_s_p9_2[] = {
 	24,
 	23,
 	25,
@@ -12966,14 +12966,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44c8_s_p9_2[] = {
+static const long _vq_lengthlist__44c8_s_p9_2[] = {
 	 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7,
 };
 
-static float _vq_quantthresh__44c8_s_p9_2[] = {
+static const float _vq_quantthresh__44c8_s_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, 
@@ -12982,7 +12982,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44c8_s_p9_2[] = {
+static const long _vq_quantmap__44c8_s_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,
@@ -12992,25 +12992,25 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c8_s_p9_2 = {
-	_vq_quantthresh__44c8_s_p9_2,
-	_vq_quantmap__44c8_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c8_s_p9_2 = {
+	(float *)_vq_quantthresh__44c8_s_p9_2,
+	(long *)_vq_quantmap__44c8_s_p9_2,
 	49,
 	49
 };
 
-static static_codebook _44c8_s_p9_2 = {
+static const static_codebook _44c8_s_p9_2 = {
 	1, 49,
-	_vq_lengthlist__44c8_s_p9_2,
+	(long *)_vq_lengthlist__44c8_s_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44c8_s_p9_2,
+	(long *)_vq_quantlist__44c8_s_p9_2,
 	NULL,
-	&_vq_auxt__44c8_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c8_s_short[] = {
+static const long _huff_lengthlist__44c8_s_short[] = {
 	 4,11,13,14,15,15,18,17,19,17, 5, 6, 8, 9,10,10,
 	12,15,19,19, 6, 6, 6, 6, 8, 8,11,14,18,19, 8, 6,
 	 5, 4, 6, 7,10,13,16,17, 9, 7, 6, 5, 6, 7, 9,12,
@@ -13020,9 +13020,9 @@
 	10, 9,11,14,
 };
 
-static static_codebook _huff_book__44c8_s_short = {
+static const static_codebook _huff_book__44c8_s_short = {
 	2, 100,
-	_huff_lengthlist__44c8_s_short,
+	(long *)_huff_lengthlist__44c8_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -13031,7 +13031,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c9_s_long[] = {
+static const long _huff_lengthlist__44c9_s_long[] = {
 	 3, 8,12,14,15,15,15,13,15,15, 6, 5, 8,10,12,12,
 	13,12,14,13,10, 6, 5, 6, 8, 9,11,11,13,13,13, 8,
 	 5, 4, 5, 6, 8,10,11,13,14,10, 7, 5, 4, 5, 7, 9,
@@ -13041,9 +13041,9 @@
 	10, 9, 8, 9,
 };
 
-static static_codebook _huff_book__44c9_s_long = {
+static const static_codebook _huff_book__44c9_s_long = {
 	2, 100,
-	_huff_lengthlist__44c9_s_long,
+	(long *)_huff_lengthlist__44c9_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -13052,13 +13052,13 @@
 	0
 };
 
-static long _vq_quantlist__44c9_s_p1_0[] = {
+static const long _vq_quantlist__44c9_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c9_s_p1_0[] = {
+static const long _vq_lengthlist__44c9_s_p1_0[] = {
 	 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 8, 8, 0, 9, 8, 0,
 	 9, 8, 6, 8, 8, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 5, 8, 8, 0, 7, 7, 0, 8, 8, 5, 8, 8,
@@ -13067,33 +13067,33 @@
 	 7,
 };
 
-static float _vq_quantthresh__44c9_s_p1_0[] = {
+static const float _vq_quantthresh__44c9_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c9_s_p1_0[] = {
+static const long _vq_quantmap__44c9_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p1_0 = {
-	_vq_quantthresh__44c9_s_p1_0,
-	_vq_quantmap__44c9_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p1_0 = {
+	(float *)_vq_quantthresh__44c9_s_p1_0,
+	(long *)_vq_quantmap__44c9_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c9_s_p1_0 = {
+static const static_codebook _44c9_s_p1_0 = {
 	4, 81,
-	_vq_lengthlist__44c9_s_p1_0,
+	(long *)_vq_lengthlist__44c9_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c9_s_p1_0,
+	(long *)_vq_quantlist__44c9_s_p1_0,
 	NULL,
-	&_vq_auxt__44c9_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p2_0[] = {
+static const long _vq_quantlist__44c9_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -13101,7 +13101,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c9_s_p2_0[] = {
+static const long _vq_lengthlist__44c9_s_p2_0[] = {
 	 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0,
 	 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 7, 7, 9, 8, 0, 8,
 	 8, 9, 9, 0, 8, 7, 9, 9, 0, 9,10,10,10, 0, 0, 0,
@@ -13144,33 +13144,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44c9_s_p2_0[] = {
+static const float _vq_quantthresh__44c9_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c9_s_p2_0[] = {
+static const long _vq_quantmap__44c9_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p2_0 = {
-	_vq_quantthresh__44c9_s_p2_0,
-	_vq_quantmap__44c9_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p2_0 = {
+	(float *)_vq_quantthresh__44c9_s_p2_0,
+	(long *)_vq_quantmap__44c9_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c9_s_p2_0 = {
+static const static_codebook _44c9_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c9_s_p2_0,
+	(long *)_vq_lengthlist__44c9_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c9_s_p2_0,
+	(long *)_vq_quantlist__44c9_s_p2_0,
 	NULL,
-	&_vq_auxt__44c9_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p3_0[] = {
+static const long _vq_quantlist__44c9_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -13182,7 +13182,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c9_s_p3_0[] = {
+static const long _vq_lengthlist__44c9_s_p3_0[] = {
 	 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 6, 7,
 	 8, 8, 0, 4, 4, 5, 5, 7, 7, 8, 8, 0, 5, 5, 6, 6,
 	 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
@@ -13191,34 +13191,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c9_s_p3_0[] = {
+static const float _vq_quantthresh__44c9_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c9_s_p3_0[] = {
+static const long _vq_quantmap__44c9_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p3_0 = {
-	_vq_quantthresh__44c9_s_p3_0,
-	_vq_quantmap__44c9_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p3_0 = {
+	(float *)_vq_quantthresh__44c9_s_p3_0,
+	(long *)_vq_quantmap__44c9_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c9_s_p3_0 = {
+static const static_codebook _44c9_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c9_s_p3_0,
+	(long *)_vq_lengthlist__44c9_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c9_s_p3_0,
+	(long *)_vq_quantlist__44c9_s_p3_0,
 	NULL,
-	&_vq_auxt__44c9_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p4_0[] = {
+static const long _vq_quantlist__44c9_s_p4_0[] = {
 	8,
 	7,
 	9,
@@ -13238,7 +13238,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c9_s_p4_0[] = {
+static const long _vq_lengthlist__44c9_s_p4_0[] = {
 	 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,10,
 	10, 0, 5, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,
 	11,11, 0, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,
@@ -13260,42 +13260,42 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c9_s_p4_0[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p4_0[] = {
+static const long _vq_quantmap__44c9_s_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__44c9_s_p4_0 = {
-	_vq_quantthresh__44c9_s_p4_0,
-	_vq_quantmap__44c9_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p4_0 = {
+	(float *)_vq_quantthresh__44c9_s_p4_0,
+	(long *)_vq_quantmap__44c9_s_p4_0,
 	17,
 	17
 };
 
-static static_codebook _44c9_s_p4_0 = {
+static const static_codebook _44c9_s_p4_0 = {
 	2, 289,
-	_vq_lengthlist__44c9_s_p4_0,
+	(long *)_vq_lengthlist__44c9_s_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c9_s_p4_0,
+	(long *)_vq_quantlist__44c9_s_p4_0,
 	NULL,
-	&_vq_auxt__44c9_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p5_0[] = {
+static const long _vq_quantlist__44c9_s_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c9_s_p5_0[] = {
+static const long _vq_lengthlist__44c9_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6, 9,10,10,10,
 	10, 9, 4, 6, 7, 9,10,10,10, 9,10, 5, 9, 9, 9,11,
 	11,10,11,11, 7,10, 9,11,12,11,12,12,12, 7, 9,10,
@@ -13304,33 +13304,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44c9_s_p5_0[] = {
+static const float _vq_quantthresh__44c9_s_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c9_s_p5_0[] = {
+static const long _vq_quantmap__44c9_s_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p5_0 = {
-	_vq_quantthresh__44c9_s_p5_0,
-	_vq_quantmap__44c9_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p5_0 = {
+	(float *)_vq_quantthresh__44c9_s_p5_0,
+	(long *)_vq_quantmap__44c9_s_p5_0,
 	3,
 	3
 };
 
-static static_codebook _44c9_s_p5_0 = {
+static const static_codebook _44c9_s_p5_0 = {
 	4, 81,
-	_vq_lengthlist__44c9_s_p5_0,
+	(long *)_vq_lengthlist__44c9_s_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c9_s_p5_0,
+	(long *)_vq_quantlist__44c9_s_p5_0,
 	NULL,
-	&_vq_auxt__44c9_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p5_1[] = {
+static const long _vq_quantlist__44c9_s_p5_1[] = {
 	5,
 	4,
 	6,
@@ -13344,7 +13344,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c9_s_p5_1[] = {
+static const long _vq_lengthlist__44c9_s_p5_1[] = {
 	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7,11, 5, 5, 6, 6,
 	 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 7, 7, 8,
 	 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6,
@@ -13355,35 +13355,35 @@
 	11,11,11, 7, 7, 7, 7, 7, 7,
 };
 
-static float _vq_quantthresh__44c9_s_p5_1[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p5_1[] = {
+static const long _vq_quantmap__44c9_s_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p5_1 = {
-	_vq_quantthresh__44c9_s_p5_1,
-	_vq_quantmap__44c9_s_p5_1,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p5_1 = {
+	(float *)_vq_quantthresh__44c9_s_p5_1,
+	(long *)_vq_quantmap__44c9_s_p5_1,
 	11,
 	11
 };
 
-static static_codebook _44c9_s_p5_1 = {
+static const static_codebook _44c9_s_p5_1 = {
 	2, 121,
-	_vq_lengthlist__44c9_s_p5_1,
+	(long *)_vq_lengthlist__44c9_s_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c9_s_p5_1,
+	(long *)_vq_quantlist__44c9_s_p5_1,
 	NULL,
-	&_vq_auxt__44c9_s_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p6_0[] = {
+static const long _vq_quantlist__44c9_s_p6_0[] = {
 	6,
 	5,
 	7,
@@ -13399,7 +13399,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c9_s_p6_0[] = {
+static const long _vq_lengthlist__44c9_s_p6_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 5, 4, 4,
 	 6, 6, 8, 8, 9, 9, 9, 9,10,10, 6, 4, 4, 6, 6, 8,
 	 8, 9, 9, 9, 9,10,10, 0, 6, 6, 7, 7, 8, 8, 9, 9,
@@ -13413,35 +13413,35 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static float _vq_quantthresh__44c9_s_p6_0[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p6_0[] = {
+static const long _vq_quantmap__44c9_s_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p6_0 = {
-	_vq_quantthresh__44c9_s_p6_0,
-	_vq_quantmap__44c9_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p6_0 = {
+	(float *)_vq_quantthresh__44c9_s_p6_0,
+	(long *)_vq_quantmap__44c9_s_p6_0,
 	13,
 	13
 };
 
-static static_codebook _44c9_s_p6_0 = {
+static const static_codebook _44c9_s_p6_0 = {
 	2, 169,
-	_vq_lengthlist__44c9_s_p6_0,
+	(long *)_vq_lengthlist__44c9_s_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c9_s_p6_0,
+	(long *)_vq_quantlist__44c9_s_p6_0,
 	NULL,
-	&_vq_auxt__44c9_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p6_1[] = {
+static const long _vq_quantlist__44c9_s_p6_1[] = {
 	2,
 	1,
 	3,
@@ -13449,38 +13449,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c9_s_p6_1[] = {
+static const long _vq_lengthlist__44c9_s_p6_1[] = {
 	 4, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5,
 	 5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static float _vq_quantthresh__44c9_s_p6_1[] = {
+static const float _vq_quantthresh__44c9_s_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c9_s_p6_1[] = {
+static const long _vq_quantmap__44c9_s_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p6_1 = {
-	_vq_quantthresh__44c9_s_p6_1,
-	_vq_quantmap__44c9_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p6_1 = {
+	(float *)_vq_quantthresh__44c9_s_p6_1,
+	(long *)_vq_quantmap__44c9_s_p6_1,
 	5,
 	5
 };
 
-static static_codebook _44c9_s_p6_1 = {
+static const static_codebook _44c9_s_p6_1 = {
 	2, 25,
-	_vq_lengthlist__44c9_s_p6_1,
+	(long *)_vq_lengthlist__44c9_s_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c9_s_p6_1,
+	(long *)_vq_quantlist__44c9_s_p6_1,
 	NULL,
-	&_vq_auxt__44c9_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p7_0[] = {
+static const long _vq_quantlist__44c9_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -13496,7 +13496,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c9_s_p7_0[] = {
+static const long _vq_lengthlist__44c9_s_p7_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8,10,10,11,11, 6, 4, 4,
 	 6, 6, 8, 8, 9, 9,10,10,12,12, 6, 4, 5, 6, 6, 8,
 	 8, 9, 9,10,10,12,12,20, 6, 6, 6, 6, 8, 8, 9,10,
@@ -13510,35 +13510,35 @@
 	19,12,12,12,12,13,13,14,14,
 };
 
-static float _vq_quantthresh__44c9_s_p7_0[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p7_0[] = {
+static const long _vq_quantmap__44c9_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p7_0 = {
-	_vq_quantthresh__44c9_s_p7_0,
-	_vq_quantmap__44c9_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p7_0 = {
+	(float *)_vq_quantthresh__44c9_s_p7_0,
+	(long *)_vq_quantmap__44c9_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c9_s_p7_0 = {
+static const static_codebook _44c9_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c9_s_p7_0,
+	(long *)_vq_lengthlist__44c9_s_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__44c9_s_p7_0,
+	(long *)_vq_quantlist__44c9_s_p7_0,
 	NULL,
-	&_vq_auxt__44c9_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p7_1[] = {
+static const long _vq_quantlist__44c9_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -13552,7 +13552,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c9_s_p7_1[] = {
+static const long _vq_lengthlist__44c9_s_p7_1[] = {
 	 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6,
 	 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7,
 	 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 6,
@@ -13563,35 +13563,35 @@
 	 8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
-static float _vq_quantthresh__44c9_s_p7_1[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p7_1[] = {
+static const long _vq_quantmap__44c9_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p7_1 = {
-	_vq_quantthresh__44c9_s_p7_1,
-	_vq_quantmap__44c9_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p7_1 = {
+	(float *)_vq_quantthresh__44c9_s_p7_1,
+	(long *)_vq_quantmap__44c9_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c9_s_p7_1 = {
+static const static_codebook _44c9_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c9_s_p7_1,
+	(long *)_vq_lengthlist__44c9_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c9_s_p7_1,
+	(long *)_vq_quantlist__44c9_s_p7_1,
 	NULL,
-	&_vq_auxt__44c9_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p8_0[] = {
+static const long _vq_quantlist__44c9_s_p8_0[] = {
 	7,
 	6,
 	8,
@@ -13609,7 +13609,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44c9_s_p8_0[] = {
+static const long _vq_lengthlist__44c9_s_p8_0[] = {
 	 1, 4, 4, 7, 6, 8, 8, 8, 8, 9, 9,10,10,11,10, 6,
 	 5, 5, 7, 7, 9, 9, 8, 9,10,10,11,11,12,12, 6, 5,
 	 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,21, 7, 8,
@@ -13627,35 +13627,35 @@
 	14,
 };
 
-static float _vq_quantthresh__44c9_s_p8_0[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p8_0[] = {
+static const long _vq_quantmap__44c9_s_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p8_0 = {
-	_vq_quantthresh__44c9_s_p8_0,
-	_vq_quantmap__44c9_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p8_0 = {
+	(float *)_vq_quantthresh__44c9_s_p8_0,
+	(long *)_vq_quantmap__44c9_s_p8_0,
 	15,
 	15
 };
 
-static static_codebook _44c9_s_p8_0 = {
+static const static_codebook _44c9_s_p8_0 = {
 	2, 225,
-	_vq_lengthlist__44c9_s_p8_0,
+	(long *)_vq_lengthlist__44c9_s_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44c9_s_p8_0,
+	(long *)_vq_quantlist__44c9_s_p8_0,
 	NULL,
-	&_vq_auxt__44c9_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p8_1[] = {
+static const long _vq_quantlist__44c9_s_p8_1[] = {
 	10,
 	9,
 	11,
@@ -13679,7 +13679,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44c9_s_p8_1[] = {
+static const long _vq_lengthlist__44c9_s_p8_1[] = {
 	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8,
@@ -13710,37 +13710,37 @@
 	 9, 9, 9,10, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__44c9_s_p8_1[] = {
+static const float _vq_quantthresh__44c9_s_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__44c9_s_p8_1[] = {
+static const long _vq_quantmap__44c9_s_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__44c9_s_p8_1 = {
-	_vq_quantthresh__44c9_s_p8_1,
-	_vq_quantmap__44c9_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p8_1 = {
+	(float *)_vq_quantthresh__44c9_s_p8_1,
+	(long *)_vq_quantmap__44c9_s_p8_1,
 	21,
 	21
 };
 
-static static_codebook _44c9_s_p8_1 = {
+static const static_codebook _44c9_s_p8_1 = {
 	2, 441,
-	_vq_lengthlist__44c9_s_p8_1,
+	(long *)_vq_lengthlist__44c9_s_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44c9_s_p8_1,
+	(long *)_vq_quantlist__44c9_s_p8_1,
 	NULL,
-	&_vq_auxt__44c9_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p9_0[] = {
+static const long _vq_quantlist__44c9_s_p9_0[] = {
 	9,
 	8,
 	10,
@@ -13762,7 +13762,7 @@
 	18,
 };
 
-static long _vq_lengthlist__44c9_s_p9_0[] = {
+static const long _vq_lengthlist__44c9_s_p9_0[] = {
 	 1, 4, 3,12,12,12,12,12,12,12,12,12,12,12,12,12,
 	12,12,12, 4, 5, 6,12,12,12,12,12,12,12,12,12,12,
 	12,12,12,12,12,12, 4, 6, 6,12,12,12,12,12,12,12,
@@ -13788,37 +13788,37 @@
 	11,11,11,11,11,11,11,11,11,
 };
 
-static float _vq_quantthresh__44c9_s_p9_0[] = {
+static const float _vq_quantthresh__44c9_s_p9_0[] = {
 	-7913.5, -6982.5, -6051.5, -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, 
 	-465.5, 465.5, 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 6051.5, 
 	6982.5, 7913.5, 
 };
 
-static long _vq_quantmap__44c9_s_p9_0[] = {
+static const long _vq_quantmap__44c9_s_p9_0[] = {
 	   17,   15,   13,   11,    9,    7,    5,    3,
 	    1,    0,    2,    4,    6,    8,   10,   12,
 	   14,   16,   18,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p9_0 = {
-	_vq_quantthresh__44c9_s_p9_0,
-	_vq_quantmap__44c9_s_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p9_0 = {
+	(float *)_vq_quantthresh__44c9_s_p9_0,
+	(long *)_vq_quantmap__44c9_s_p9_0,
 	19,
 	19
 };
 
-static static_codebook _44c9_s_p9_0 = {
+static const static_codebook _44c9_s_p9_0 = {
 	2, 361,
-	_vq_lengthlist__44c9_s_p9_0,
+	(long *)_vq_lengthlist__44c9_s_p9_0,
 	1, -508535424, 1631393792, 5, 0,
-	_vq_quantlist__44c9_s_p9_0,
+	(long *)_vq_quantlist__44c9_s_p9_0,
 	NULL,
-	&_vq_auxt__44c9_s_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p9_1[] = {
+static const long _vq_quantlist__44c9_s_p9_1[] = {
 	9,
 	8,
 	10,
@@ -13840,7 +13840,7 @@
 	18,
 };
 
-static long _vq_lengthlist__44c9_s_p9_1[] = {
+static const long _vq_lengthlist__44c9_s_p9_1[] = {
 	 1, 4, 4, 7, 7, 7, 7, 8, 7, 9, 8, 9, 9,10,10,11,
 	11,11,11, 6, 5, 5, 8, 8, 9, 9, 9, 8,10, 9,11,10,
 	12,12,13,12,13,13, 5, 5, 5, 8, 8, 9, 9, 9, 9,10,
@@ -13866,37 +13866,37 @@
 	13,13,13,14,13,14,15,15,15,
 };
 
-static float _vq_quantthresh__44c9_s_p9_1[] = {
+static const float _vq_quantthresh__44c9_s_p9_1[] = {
 	-416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, 
 	-24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, 
 	367.5, 416.5, 
 };
 
-static long _vq_quantmap__44c9_s_p9_1[] = {
+static const long _vq_quantmap__44c9_s_p9_1[] = {
 	   17,   15,   13,   11,    9,    7,    5,    3,
 	    1,    0,    2,    4,    6,    8,   10,   12,
 	   14,   16,   18,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p9_1 = {
-	_vq_quantthresh__44c9_s_p9_1,
-	_vq_quantmap__44c9_s_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p9_1 = {
+	(float *)_vq_quantthresh__44c9_s_p9_1,
+	(long *)_vq_quantmap__44c9_s_p9_1,
 	19,
 	19
 };
 
-static static_codebook _44c9_s_p9_1 = {
+static const static_codebook _44c9_s_p9_1 = {
 	2, 361,
-	_vq_lengthlist__44c9_s_p9_1,
+	(long *)_vq_lengthlist__44c9_s_p9_1,
 	1, -518287360, 1622704128, 5, 0,
-	_vq_quantlist__44c9_s_p9_1,
+	(long *)_vq_quantlist__44c9_s_p9_1,
 	NULL,
-	&_vq_auxt__44c9_s_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c9_s_p9_2[] = {
+static const long _vq_quantlist__44c9_s_p9_2[] = {
 	24,
 	23,
 	25,
@@ -13948,14 +13948,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44c9_s_p9_2[] = {
+static const long _vq_lengthlist__44c9_s_p9_2[] = {
 	 2, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7,
 };
 
-static float _vq_quantthresh__44c9_s_p9_2[] = {
+static const float _vq_quantthresh__44c9_s_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, 
@@ -13964,7 +13964,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44c9_s_p9_2[] = {
+static const long _vq_quantmap__44c9_s_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,
@@ -13974,25 +13974,25 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c9_s_p9_2 = {
-	_vq_quantthresh__44c9_s_p9_2,
-	_vq_quantmap__44c9_s_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44c9_s_p9_2 = {
+	(float *)_vq_quantthresh__44c9_s_p9_2,
+	(long *)_vq_quantmap__44c9_s_p9_2,
 	49,
 	49
 };
 
-static static_codebook _44c9_s_p9_2 = {
+static const static_codebook _44c9_s_p9_2 = {
 	1, 49,
-	_vq_lengthlist__44c9_s_p9_2,
+	(long *)_vq_lengthlist__44c9_s_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44c9_s_p9_2,
+	(long *)_vq_quantlist__44c9_s_p9_2,
 	NULL,
-	&_vq_auxt__44c9_s_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c9_s_short[] = {
+static const long _huff_lengthlist__44c9_s_short[] = {
 	 5,13,18,16,17,17,19,18,19,19, 5, 7,10,11,12,12,
 	13,16,17,18, 6, 6, 7, 7, 9, 9,10,14,17,19, 8, 7,
 	 6, 5, 6, 7, 9,12,19,17, 8, 7, 7, 6, 5, 6, 8,11,
@@ -14002,9 +14002,9 @@
 	 9, 8,10,13,
 };
 
-static static_codebook _huff_book__44c9_s_short = {
+static const static_codebook _huff_book__44c9_s_short = {
 	2, 100,
-	_huff_lengthlist__44c9_s_short,
+	(long *)_huff_lengthlist__44c9_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -14013,7 +14013,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c0_s_long[] = {
+static const long _huff_lengthlist__44c0_s_long[] = {
 	 5, 4, 8, 9, 8, 9,10,12,15, 4, 1, 5, 5, 6, 8,11,
 	12,12, 8, 5, 8, 9, 9,11,13,12,12, 9, 5, 8, 5, 7,
 	 9,12,13,13, 8, 6, 8, 7, 7, 9,11,11,11, 9, 7, 9,
@@ -14022,9 +14022,9 @@
 	12,
 };
 
-static static_codebook _huff_book__44c0_s_long = {
+static const static_codebook _huff_book__44c0_s_long = {
 	2, 81,
-	_huff_lengthlist__44c0_s_long,
+	(long *)_huff_lengthlist__44c0_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -14033,13 +14033,13 @@
 	0
 };
 
-static long _vq_quantlist__44c0_s_p1_0[] = {
+static const long _vq_quantlist__44c0_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_s_p1_0[] = {
+static const long _vq_lengthlist__44c0_s_p1_0[] = {
 	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -14453,33 +14453,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p1_0[] = {
+static const float _vq_quantthresh__44c0_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c0_s_p1_0[] = {
+static const long _vq_quantmap__44c0_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p1_0 = {
-	_vq_quantthresh__44c0_s_p1_0,
-	_vq_quantmap__44c0_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p1_0 = {
+	(float *)_vq_quantthresh__44c0_s_p1_0,
+	(long *)_vq_quantmap__44c0_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_s_p1_0 = {
+static const static_codebook _44c0_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c0_s_p1_0,
+	(long *)_vq_lengthlist__44c0_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c0_s_p1_0,
+	(long *)_vq_quantlist__44c0_s_p1_0,
 	NULL,
-	&_vq_auxt__44c0_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p2_0[] = {
+static const long _vq_quantlist__44c0_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -14487,7 +14487,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_s_p2_0[] = {
+static const long _vq_lengthlist__44c0_s_p2_0[] = {
 	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -14530,33 +14530,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p2_0[] = {
+static const float _vq_quantthresh__44c0_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_s_p2_0[] = {
+static const long _vq_quantmap__44c0_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p2_0 = {
-	_vq_quantthresh__44c0_s_p2_0,
-	_vq_quantmap__44c0_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p2_0 = {
+	(float *)_vq_quantthresh__44c0_s_p2_0,
+	(long *)_vq_quantmap__44c0_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c0_s_p2_0 = {
+static const static_codebook _44c0_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c0_s_p2_0,
+	(long *)_vq_lengthlist__44c0_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_s_p2_0,
+	(long *)_vq_quantlist__44c0_s_p2_0,
 	NULL,
-	&_vq_auxt__44c0_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p3_0[] = {
+static const long _vq_quantlist__44c0_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -14568,7 +14568,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_s_p3_0[] = {
+static const long _vq_lengthlist__44c0_s_p3_0[] = {
 	 1, 3, 2, 8, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -14577,34 +14577,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p3_0[] = {
+static const float _vq_quantthresh__44c0_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c0_s_p3_0[] = {
+static const long _vq_quantmap__44c0_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p3_0 = {
-	_vq_quantthresh__44c0_s_p3_0,
-	_vq_quantmap__44c0_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p3_0 = {
+	(float *)_vq_quantthresh__44c0_s_p3_0,
+	(long *)_vq_quantmap__44c0_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_s_p3_0 = {
+static const static_codebook _44c0_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_s_p3_0,
+	(long *)_vq_lengthlist__44c0_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_s_p3_0,
+	(long *)_vq_quantlist__44c0_s_p3_0,
 	NULL,
-	&_vq_auxt__44c0_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p4_0[] = {
+static const long _vq_quantlist__44c0_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -14616,7 +14616,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_s_p4_0[] = {
+static const long _vq_lengthlist__44c0_s_p4_0[] = {
 	 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7,
 	 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7,
 	 7, 8, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0,
@@ -14625,34 +14625,34 @@
 	10,
 };
 
-static float _vq_quantthresh__44c0_s_p4_0[] = {
+static const float _vq_quantthresh__44c0_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c0_s_p4_0[] = {
+static const long _vq_quantmap__44c0_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p4_0 = {
-	_vq_quantthresh__44c0_s_p4_0,
-	_vq_quantmap__44c0_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p4_0 = {
+	(float *)_vq_quantthresh__44c0_s_p4_0,
+	(long *)_vq_quantmap__44c0_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_s_p4_0 = {
+static const static_codebook _44c0_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_s_p4_0,
+	(long *)_vq_lengthlist__44c0_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_s_p4_0,
+	(long *)_vq_quantlist__44c0_s_p4_0,
 	NULL,
-	&_vq_auxt__44c0_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p5_0[] = {
+static const long _vq_quantlist__44c0_s_p5_0[] = {
 	8,
 	7,
 	9,
@@ -14672,7 +14672,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c0_s_p5_0[] = {
+static const long _vq_lengthlist__44c0_s_p5_0[] = {
 	 1, 4, 3, 6, 6, 8, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9, 9,10,10,10,
 	11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -14694,42 +14694,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44c0_s_p5_0[] = {
+static const float _vq_quantthresh__44c0_s_p5_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__44c0_s_p5_0[] = {
+static const long _vq_quantmap__44c0_s_p5_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p5_0 = {
-	_vq_quantthresh__44c0_s_p5_0,
-	_vq_quantmap__44c0_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p5_0 = {
+	(float *)_vq_quantthresh__44c0_s_p5_0,
+	(long *)_vq_quantmap__44c0_s_p5_0,
 	17,
 	17
 };
 
-static static_codebook _44c0_s_p5_0 = {
+static const static_codebook _44c0_s_p5_0 = {
 	2, 289,
-	_vq_lengthlist__44c0_s_p5_0,
+	(long *)_vq_lengthlist__44c0_s_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_s_p5_0,
+	(long *)_vq_quantlist__44c0_s_p5_0,
 	NULL,
-	&_vq_auxt__44c0_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p6_0[] = {
+static const long _vq_quantlist__44c0_s_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_s_p6_0[] = {
+static const long _vq_lengthlist__44c0_s_p6_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10,
 	 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11,
 	11,12,10,11, 6, 9, 9,11,10,11,11,10,10, 6, 9, 9,
@@ -14738,33 +14738,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44c0_s_p6_0[] = {
+static const float _vq_quantthresh__44c0_s_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c0_s_p6_0[] = {
+static const long _vq_quantmap__44c0_s_p6_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p6_0 = {
-	_vq_quantthresh__44c0_s_p6_0,
-	_vq_quantmap__44c0_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p6_0 = {
+	(float *)_vq_quantthresh__44c0_s_p6_0,
+	(long *)_vq_quantmap__44c0_s_p6_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_s_p6_0 = {
+static const static_codebook _44c0_s_p6_0 = {
 	4, 81,
-	_vq_lengthlist__44c0_s_p6_0,
+	(long *)_vq_lengthlist__44c0_s_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c0_s_p6_0,
+	(long *)_vq_quantlist__44c0_s_p6_0,
 	NULL,
-	&_vq_auxt__44c0_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p6_1[] = {
+static const long _vq_quantlist__44c0_s_p6_1[] = {
 	5,
 	4,
 	6,
@@ -14778,7 +14778,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c0_s_p6_1[] = {
+static const long _vq_lengthlist__44c0_s_p6_1[] = {
 	 2, 3, 3, 6, 6, 7, 7, 7, 7, 7, 8,10,10,10, 6, 6,
 	 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8,
 	 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7,
@@ -14789,35 +14789,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c0_s_p6_1[] = {
+static const float _vq_quantthresh__44c0_s_p6_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__44c0_s_p6_1[] = {
+static const long _vq_quantmap__44c0_s_p6_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p6_1 = {
-	_vq_quantthresh__44c0_s_p6_1,
-	_vq_quantmap__44c0_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p6_1 = {
+	(float *)_vq_quantthresh__44c0_s_p6_1,
+	(long *)_vq_quantmap__44c0_s_p6_1,
 	11,
 	11
 };
 
-static static_codebook _44c0_s_p6_1 = {
+static const static_codebook _44c0_s_p6_1 = {
 	2, 121,
-	_vq_lengthlist__44c0_s_p6_1,
+	(long *)_vq_lengthlist__44c0_s_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c0_s_p6_1,
+	(long *)_vq_quantlist__44c0_s_p6_1,
 	NULL,
-	&_vq_auxt__44c0_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p7_0[] = {
+static const long _vq_quantlist__44c0_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -14833,7 +14833,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c0_s_p7_0[] = {
+static const long _vq_lengthlist__44c0_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8,
 	 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -14847,35 +14847,35 @@
 	 0,12,12,11,11,12,12,13,13,
 };
 
-static float _vq_quantthresh__44c0_s_p7_0[] = {
+static const float _vq_quantthresh__44c0_s_p7_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__44c0_s_p7_0[] = {
+static const long _vq_quantmap__44c0_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p7_0 = {
-	_vq_quantthresh__44c0_s_p7_0,
-	_vq_quantmap__44c0_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p7_0 = {
+	(float *)_vq_quantthresh__44c0_s_p7_0,
+	(long *)_vq_quantmap__44c0_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c0_s_p7_0 = {
+static const static_codebook _44c0_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c0_s_p7_0,
+	(long *)_vq_lengthlist__44c0_s_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c0_s_p7_0,
+	(long *)_vq_quantlist__44c0_s_p7_0,
 	NULL,
-	&_vq_auxt__44c0_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p7_1[] = {
+static const long _vq_quantlist__44c0_s_p7_1[] = {
 	2,
 	1,
 	3,
@@ -14883,38 +14883,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_s_p7_1[] = {
+static const long _vq_lengthlist__44c0_s_p7_1[] = {
 	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c0_s_p7_1[] = {
+static const float _vq_quantthresh__44c0_s_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_s_p7_1[] = {
+static const long _vq_quantmap__44c0_s_p7_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p7_1 = {
-	_vq_quantthresh__44c0_s_p7_1,
-	_vq_quantmap__44c0_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p7_1 = {
+	(float *)_vq_quantthresh__44c0_s_p7_1,
+	(long *)_vq_quantmap__44c0_s_p7_1,
 	5,
 	5
 };
 
-static static_codebook _44c0_s_p7_1 = {
+static const static_codebook _44c0_s_p7_1 = {
 	2, 25,
-	_vq_lengthlist__44c0_s_p7_1,
+	(long *)_vq_lengthlist__44c0_s_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_s_p7_1,
+	(long *)_vq_quantlist__44c0_s_p7_1,
 	NULL,
-	&_vq_auxt__44c0_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p8_0[] = {
+static const long _vq_quantlist__44c0_s_p8_0[] = {
 	2,
 	1,
 	3,
@@ -14922,7 +14922,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_s_p8_0[] = {
+static const long _vq_lengthlist__44c0_s_p8_0[] = {
 	 1, 5, 5,10,10, 6, 9, 8,10,10, 6,10, 9,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,10,10,
@@ -14965,33 +14965,33 @@
 	11,
 };
 
-static float _vq_quantthresh__44c0_s_p8_0[] = {
+static const float _vq_quantthresh__44c0_s_p8_0[] = {
 	-331.5, -110.5, 110.5, 331.5, 
 };
 
-static long _vq_quantmap__44c0_s_p8_0[] = {
+static const long _vq_quantmap__44c0_s_p8_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_0 = {
-	_vq_quantthresh__44c0_s_p8_0,
-	_vq_quantmap__44c0_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p8_0 = {
+	(float *)_vq_quantthresh__44c0_s_p8_0,
+	(long *)_vq_quantmap__44c0_s_p8_0,
 	5,
 	5
 };
 
-static static_codebook _44c0_s_p8_0 = {
+static const static_codebook _44c0_s_p8_0 = {
 	4, 625,
-	_vq_lengthlist__44c0_s_p8_0,
+	(long *)_vq_lengthlist__44c0_s_p8_0,
 	1, -518283264, 1627103232, 3, 0,
-	_vq_quantlist__44c0_s_p8_0,
+	(long *)_vq_quantlist__44c0_s_p8_0,
 	NULL,
-	&_vq_auxt__44c0_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p8_1[] = {
+static const long _vq_quantlist__44c0_s_p8_1[] = {
 	6,
 	5,
 	7,
@@ -15007,7 +15007,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c0_s_p8_1[] = {
+static const long _vq_lengthlist__44c0_s_p8_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 9, 9,11,12,13,12, 6, 5, 5,
 	 7, 7, 8, 8,10, 9,12,12,12,12, 6, 5, 5, 7, 7, 8,
 	 8,10, 9,12,11,11,13,16, 7, 7, 8, 8, 9, 9,10,10,
@@ -15021,35 +15021,35 @@
 	16,13,13,12,12,14,14,15,13,
 };
 
-static float _vq_quantthresh__44c0_s_p8_1[] = {
+static const float _vq_quantthresh__44c0_s_p8_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44c0_s_p8_1[] = {
+static const long _vq_quantmap__44c0_s_p8_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_1 = {
-	_vq_quantthresh__44c0_s_p8_1,
-	_vq_quantmap__44c0_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p8_1 = {
+	(float *)_vq_quantthresh__44c0_s_p8_1,
+	(long *)_vq_quantmap__44c0_s_p8_1,
 	13,
 	13
 };
 
-static static_codebook _44c0_s_p8_1 = {
+static const static_codebook _44c0_s_p8_1 = {
 	2, 169,
-	_vq_lengthlist__44c0_s_p8_1,
+	(long *)_vq_lengthlist__44c0_s_p8_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c0_s_p8_1,
+	(long *)_vq_quantlist__44c0_s_p8_1,
 	NULL,
-	&_vq_auxt__44c0_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p8_2[] = {
+static const long _vq_quantlist__44c0_s_p8_2[] = {
 	8,
 	7,
 	9,
@@ -15069,7 +15069,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c0_s_p8_2[] = {
+static const long _vq_lengthlist__44c0_s_p8_2[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8,10,10,10, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9,
@@ -15091,36 +15091,36 @@
 	10,
 };
 
-static float _vq_quantthresh__44c0_s_p8_2[] = {
+static const float _vq_quantthresh__44c0_s_p8_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__44c0_s_p8_2[] = {
+static const long _vq_quantmap__44c0_s_p8_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_2 = {
-	_vq_quantthresh__44c0_s_p8_2,
-	_vq_quantmap__44c0_s_p8_2,
+static const encode_aux_threshmatch _vq_auxt__44c0_s_p8_2 = {
+	(float *)_vq_quantthresh__44c0_s_p8_2,
+	(long *)_vq_quantmap__44c0_s_p8_2,
 	17,
 	17
 };
 
-static static_codebook _44c0_s_p8_2 = {
+static const static_codebook _44c0_s_p8_2 = {
 	2, 289,
-	_vq_lengthlist__44c0_s_p8_2,
+	(long *)_vq_lengthlist__44c0_s_p8_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_s_p8_2,
+	(long *)_vq_quantlist__44c0_s_p8_2,
 	NULL,
-	&_vq_auxt__44c0_s_p8_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c0_s_short[] = {
+static const long _huff_lengthlist__44c0_s_short[] = {
 	 9, 8,12,11,12,13,14,14,16, 6, 1, 5, 6, 6, 9,12,
 	14,17, 9, 4, 5, 9, 7, 9,13,15,16, 8, 5, 8, 6, 8,
 	10,13,17,17, 9, 6, 7, 7, 8, 9,13,15,17,11, 8, 9,
@@ -15129,9 +15129,9 @@
 	12,
 };
 
-static static_codebook _huff_book__44c0_s_short = {
+static const static_codebook _huff_book__44c0_s_short = {
 	2, 81,
-	_huff_lengthlist__44c0_s_short,
+	(long *)_huff_lengthlist__44c0_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -15140,7 +15140,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c0_sm_long[] = {
+static const long _huff_lengthlist__44c0_sm_long[] = {
 	 5, 4, 9,10, 9,10,11,12,13, 4, 1, 5, 7, 7, 9,11,
 	12,14, 8, 5, 7, 9, 8,10,13,13,13,10, 7, 9, 4, 6,
 	 7,10,12,14, 9, 6, 7, 6, 6, 7,10,12,12, 9, 8, 9,
@@ -15149,9 +15149,9 @@
 	13,
 };
 
-static static_codebook _huff_book__44c0_sm_long = {
+static const static_codebook _huff_book__44c0_sm_long = {
 	2, 81,
-	_huff_lengthlist__44c0_sm_long,
+	(long *)_huff_lengthlist__44c0_sm_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -15160,13 +15160,13 @@
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p1_0[] = {
+static const long _vq_quantlist__44c0_sm_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_sm_p1_0[] = {
+static const long _vq_lengthlist__44c0_sm_p1_0[] = {
 	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -15580,33 +15580,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_sm_p1_0[] = {
+static const float _vq_quantthresh__44c0_sm_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p1_0[] = {
+static const long _vq_quantmap__44c0_sm_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p1_0 = {
-	_vq_quantthresh__44c0_sm_p1_0,
-	_vq_quantmap__44c0_sm_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p1_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p1_0,
+	(long *)_vq_quantmap__44c0_sm_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_sm_p1_0 = {
+static const static_codebook _44c0_sm_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c0_sm_p1_0,
+	(long *)_vq_lengthlist__44c0_sm_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c0_sm_p1_0,
+	(long *)_vq_quantlist__44c0_sm_p1_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p2_0[] = {
+static const long _vq_quantlist__44c0_sm_p2_0[] = {
 	2,
 	1,
 	3,
@@ -15614,7 +15614,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_sm_p2_0[] = {
+static const long _vq_lengthlist__44c0_sm_p2_0[] = {
 	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -15657,33 +15657,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_sm_p2_0[] = {
+static const float _vq_quantthresh__44c0_sm_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p2_0[] = {
+static const long _vq_quantmap__44c0_sm_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p2_0 = {
-	_vq_quantthresh__44c0_sm_p2_0,
-	_vq_quantmap__44c0_sm_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p2_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p2_0,
+	(long *)_vq_quantmap__44c0_sm_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c0_sm_p2_0 = {
+static const static_codebook _44c0_sm_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c0_sm_p2_0,
+	(long *)_vq_lengthlist__44c0_sm_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_sm_p2_0,
+	(long *)_vq_quantlist__44c0_sm_p2_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p3_0[] = {
+static const long _vq_quantlist__44c0_sm_p3_0[] = {
 	4,
 	3,
 	5,
@@ -15695,7 +15695,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_sm_p3_0[] = {
+static const long _vq_lengthlist__44c0_sm_p3_0[] = {
 	 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 4, 7, 7, 0, 0,
 	 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0,
@@ -15704,34 +15704,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_sm_p3_0[] = {
+static const float _vq_quantthresh__44c0_sm_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p3_0[] = {
+static const long _vq_quantmap__44c0_sm_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p3_0 = {
-	_vq_quantthresh__44c0_sm_p3_0,
-	_vq_quantmap__44c0_sm_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p3_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p3_0,
+	(long *)_vq_quantmap__44c0_sm_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_sm_p3_0 = {
+static const static_codebook _44c0_sm_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_sm_p3_0,
+	(long *)_vq_lengthlist__44c0_sm_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_sm_p3_0,
+	(long *)_vq_quantlist__44c0_sm_p3_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p4_0[] = {
+static const long _vq_quantlist__44c0_sm_p4_0[] = {
 	4,
 	3,
 	5,
@@ -15743,7 +15743,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_sm_p4_0[] = {
+static const long _vq_lengthlist__44c0_sm_p4_0[] = {
 	 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7,
 	 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8,
 	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
@@ -15752,34 +15752,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44c0_sm_p4_0[] = {
+static const float _vq_quantthresh__44c0_sm_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p4_0[] = {
+static const long _vq_quantmap__44c0_sm_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p4_0 = {
-	_vq_quantthresh__44c0_sm_p4_0,
-	_vq_quantmap__44c0_sm_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p4_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p4_0,
+	(long *)_vq_quantmap__44c0_sm_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_sm_p4_0 = {
+static const static_codebook _44c0_sm_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_sm_p4_0,
+	(long *)_vq_lengthlist__44c0_sm_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_sm_p4_0,
+	(long *)_vq_quantlist__44c0_sm_p4_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p5_0[] = {
+static const long _vq_quantlist__44c0_sm_p5_0[] = {
 	8,
 	7,
 	9,
@@ -15799,7 +15799,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c0_sm_p5_0[] = {
+static const long _vq_lengthlist__44c0_sm_p5_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11,
 	11,11, 0, 5, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -15821,42 +15821,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44c0_sm_p5_0[] = {
+static const float _vq_quantthresh__44c0_sm_p5_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__44c0_sm_p5_0[] = {
+static const long _vq_quantmap__44c0_sm_p5_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p5_0 = {
-	_vq_quantthresh__44c0_sm_p5_0,
-	_vq_quantmap__44c0_sm_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p5_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p5_0,
+	(long *)_vq_quantmap__44c0_sm_p5_0,
 	17,
 	17
 };
 
-static static_codebook _44c0_sm_p5_0 = {
+static const static_codebook _44c0_sm_p5_0 = {
 	2, 289,
-	_vq_lengthlist__44c0_sm_p5_0,
+	(long *)_vq_lengthlist__44c0_sm_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_sm_p5_0,
+	(long *)_vq_quantlist__44c0_sm_p5_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p6_0[] = {
+static const long _vq_quantlist__44c0_sm_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_sm_p6_0[] = {
+static const long _vq_lengthlist__44c0_sm_p6_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11,
 	11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9,
@@ -15865,33 +15865,33 @@
 	11,
 };
 
-static float _vq_quantthresh__44c0_sm_p6_0[] = {
+static const float _vq_quantthresh__44c0_sm_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p6_0[] = {
+static const long _vq_quantmap__44c0_sm_p6_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p6_0 = {
-	_vq_quantthresh__44c0_sm_p6_0,
-	_vq_quantmap__44c0_sm_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p6_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p6_0,
+	(long *)_vq_quantmap__44c0_sm_p6_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_sm_p6_0 = {
+static const static_codebook _44c0_sm_p6_0 = {
 	4, 81,
-	_vq_lengthlist__44c0_sm_p6_0,
+	(long *)_vq_lengthlist__44c0_sm_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c0_sm_p6_0,
+	(long *)_vq_quantlist__44c0_sm_p6_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p6_1[] = {
+static const long _vq_quantlist__44c0_sm_p6_1[] = {
 	5,
 	4,
 	6,
@@ -15905,7 +15905,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c0_sm_p6_1[] = {
+static const long _vq_lengthlist__44c0_sm_p6_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 9, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7,
@@ -15916,35 +15916,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c0_sm_p6_1[] = {
+static const float _vq_quantthresh__44c0_sm_p6_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__44c0_sm_p6_1[] = {
+static const long _vq_quantmap__44c0_sm_p6_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p6_1 = {
-	_vq_quantthresh__44c0_sm_p6_1,
-	_vq_quantmap__44c0_sm_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p6_1 = {
+	(float *)_vq_quantthresh__44c0_sm_p6_1,
+	(long *)_vq_quantmap__44c0_sm_p6_1,
 	11,
 	11
 };
 
-static static_codebook _44c0_sm_p6_1 = {
+static const static_codebook _44c0_sm_p6_1 = {
 	2, 121,
-	_vq_lengthlist__44c0_sm_p6_1,
+	(long *)_vq_lengthlist__44c0_sm_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c0_sm_p6_1,
+	(long *)_vq_quantlist__44c0_sm_p6_1,
 	NULL,
-	&_vq_auxt__44c0_sm_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p7_0[] = {
+static const long _vq_quantlist__44c0_sm_p7_0[] = {
 	6,
 	5,
 	7,
@@ -15960,7 +15960,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c0_sm_p7_0[] = {
+static const long _vq_lengthlist__44c0_sm_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8,
 	 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -15974,35 +15974,35 @@
 	 0,12,12,11,11,13,12,14,14,
 };
 
-static float _vq_quantthresh__44c0_sm_p7_0[] = {
+static const float _vq_quantthresh__44c0_sm_p7_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__44c0_sm_p7_0[] = {
+static const long _vq_quantmap__44c0_sm_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_0 = {
-	_vq_quantthresh__44c0_sm_p7_0,
-	_vq_quantmap__44c0_sm_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p7_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p7_0,
+	(long *)_vq_quantmap__44c0_sm_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c0_sm_p7_0 = {
+static const static_codebook _44c0_sm_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c0_sm_p7_0,
+	(long *)_vq_lengthlist__44c0_sm_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c0_sm_p7_0,
+	(long *)_vq_quantlist__44c0_sm_p7_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p7_1[] = {
+static const long _vq_quantlist__44c0_sm_p7_1[] = {
 	2,
 	1,
 	3,
@@ -16010,38 +16010,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_sm_p7_1[] = {
+static const long _vq_lengthlist__44c0_sm_p7_1[] = {
 	 2, 4, 4, 4, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c0_sm_p7_1[] = {
+static const float _vq_quantthresh__44c0_sm_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p7_1[] = {
+static const long _vq_quantmap__44c0_sm_p7_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_1 = {
-	_vq_quantthresh__44c0_sm_p7_1,
-	_vq_quantmap__44c0_sm_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p7_1 = {
+	(float *)_vq_quantthresh__44c0_sm_p7_1,
+	(long *)_vq_quantmap__44c0_sm_p7_1,
 	5,
 	5
 };
 
-static static_codebook _44c0_sm_p7_1 = {
+static const static_codebook _44c0_sm_p7_1 = {
 	2, 25,
-	_vq_lengthlist__44c0_sm_p7_1,
+	(long *)_vq_lengthlist__44c0_sm_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_sm_p7_1,
+	(long *)_vq_quantlist__44c0_sm_p7_1,
 	NULL,
-	&_vq_auxt__44c0_sm_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p8_0[] = {
+static const long _vq_quantlist__44c0_sm_p8_0[] = {
 	4,
 	3,
 	5,
@@ -16053,7 +16053,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_sm_p8_0[] = {
+static const long _vq_lengthlist__44c0_sm_p8_0[] = {
 	 1, 3, 3,11,11,11,11,11,11, 3, 7, 6,11,11,11,11,
 	11,11, 4, 8, 7,11,11,11,11,11,11,11,11,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -16062,34 +16062,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44c0_sm_p8_0[] = {
+static const float _vq_quantthresh__44c0_sm_p8_0[] = {
 	-773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 552.5, 773.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p8_0[] = {
+static const long _vq_quantmap__44c0_sm_p8_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_0 = {
-	_vq_quantthresh__44c0_sm_p8_0,
-	_vq_quantmap__44c0_sm_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p8_0 = {
+	(float *)_vq_quantthresh__44c0_sm_p8_0,
+	(long *)_vq_quantmap__44c0_sm_p8_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_sm_p8_0 = {
+static const static_codebook _44c0_sm_p8_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_sm_p8_0,
+	(long *)_vq_lengthlist__44c0_sm_p8_0,
 	1, -516186112, 1627103232, 4, 0,
-	_vq_quantlist__44c0_sm_p8_0,
+	(long *)_vq_quantlist__44c0_sm_p8_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p8_1[] = {
+static const long _vq_quantlist__44c0_sm_p8_1[] = {
 	6,
 	5,
 	7,
@@ -16105,7 +16105,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c0_sm_p8_1[] = {
+static const long _vq_lengthlist__44c0_sm_p8_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5,
 	 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8,
 	 8,10,10,12,11,12,12,17, 7, 7, 8, 8, 9, 9,10,10,
@@ -16119,35 +16119,35 @@
 	20,13,13,12,12,16,13,15,13,
 };
 
-static float _vq_quantthresh__44c0_sm_p8_1[] = {
+static const float _vq_quantthresh__44c0_sm_p8_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p8_1[] = {
+static const long _vq_quantmap__44c0_sm_p8_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_1 = {
-	_vq_quantthresh__44c0_sm_p8_1,
-	_vq_quantmap__44c0_sm_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p8_1 = {
+	(float *)_vq_quantthresh__44c0_sm_p8_1,
+	(long *)_vq_quantmap__44c0_sm_p8_1,
 	13,
 	13
 };
 
-static static_codebook _44c0_sm_p8_1 = {
+static const static_codebook _44c0_sm_p8_1 = {
 	2, 169,
-	_vq_lengthlist__44c0_sm_p8_1,
+	(long *)_vq_lengthlist__44c0_sm_p8_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c0_sm_p8_1,
+	(long *)_vq_quantlist__44c0_sm_p8_1,
 	NULL,
-	&_vq_auxt__44c0_sm_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p8_2[] = {
+static const long _vq_quantlist__44c0_sm_p8_2[] = {
 	8,
 	7,
 	9,
@@ -16167,7 +16167,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c0_sm_p8_2[] = {
+static const long _vq_lengthlist__44c0_sm_p8_2[] = {
 	 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9,10, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9,
@@ -16189,36 +16189,36 @@
 	 9,
 };
 
-static float _vq_quantthresh__44c0_sm_p8_2[] = {
+static const float _vq_quantthresh__44c0_sm_p8_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__44c0_sm_p8_2[] = {
+static const long _vq_quantmap__44c0_sm_p8_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_2 = {
-	_vq_quantthresh__44c0_sm_p8_2,
-	_vq_quantmap__44c0_sm_p8_2,
+static const encode_aux_threshmatch _vq_auxt__44c0_sm_p8_2 = {
+	(float *)_vq_quantthresh__44c0_sm_p8_2,
+	(long *)_vq_quantmap__44c0_sm_p8_2,
 	17,
 	17
 };
 
-static static_codebook _44c0_sm_p8_2 = {
+static const static_codebook _44c0_sm_p8_2 = {
 	2, 289,
-	_vq_lengthlist__44c0_sm_p8_2,
+	(long *)_vq_lengthlist__44c0_sm_p8_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_sm_p8_2,
+	(long *)_vq_quantlist__44c0_sm_p8_2,
 	NULL,
-	&_vq_auxt__44c0_sm_p8_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c0_sm_short[] = {
+static const long _huff_lengthlist__44c0_sm_short[] = {
 	 6, 6,12,13,13,14,16,17,17, 4, 2, 5, 8, 7, 9,12,
 	15,15, 9, 4, 5, 9, 7, 9,12,16,18,11, 6, 7, 4, 6,
 	 8,11,14,18,10, 5, 6, 5, 5, 7,10,14,17,10, 5, 7,
@@ -16227,9 +16227,9 @@
 	12,
 };
 
-static static_codebook _huff_book__44c0_sm_short = {
+static const static_codebook _huff_book__44c0_sm_short = {
 	2, 81,
-	_huff_lengthlist__44c0_sm_short,
+	(long *)_huff_lengthlist__44c0_sm_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -16238,7 +16238,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c1_s_long[] = {
+static const long _huff_lengthlist__44c1_s_long[] = {
 	 5, 5, 9,10, 9, 9,10,11,12, 5, 1, 5, 6, 6, 7,10,
 	12,14, 9, 5, 6, 8, 8,10,12,14,14,10, 5, 8, 5, 6,
 	 8,11,13,14, 9, 5, 7, 6, 6, 8,10,12,11, 9, 7, 9,
@@ -16247,9 +16247,9 @@
 	11,
 };
 
-static static_codebook _huff_book__44c1_s_long = {
+static const static_codebook _huff_book__44c1_s_long = {
 	2, 81,
-	_huff_lengthlist__44c1_s_long,
+	(long *)_huff_lengthlist__44c1_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -16258,13 +16258,13 @@
 	0
 };
 
-static long _vq_quantlist__44c1_s_p1_0[] = {
+static const long _vq_quantlist__44c1_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c1_s_p1_0[] = {
+static const long _vq_lengthlist__44c1_s_p1_0[] = {
 	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 0,
 	 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -16678,33 +16678,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_s_p1_0[] = {
+static const float _vq_quantthresh__44c1_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c1_s_p1_0[] = {
+static const long _vq_quantmap__44c1_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p1_0 = {
-	_vq_quantthresh__44c1_s_p1_0,
-	_vq_quantmap__44c1_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p1_0 = {
+	(float *)_vq_quantthresh__44c1_s_p1_0,
+	(long *)_vq_quantmap__44c1_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c1_s_p1_0 = {
+static const static_codebook _44c1_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c1_s_p1_0,
+	(long *)_vq_lengthlist__44c1_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c1_s_p1_0,
+	(long *)_vq_quantlist__44c1_s_p1_0,
 	NULL,
-	&_vq_auxt__44c1_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p2_0[] = {
+static const long _vq_quantlist__44c1_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -16712,7 +16712,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c1_s_p2_0[] = {
+static const long _vq_lengthlist__44c1_s_p2_0[] = {
 	 2, 3, 4, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -16755,33 +16755,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_s_p2_0[] = {
+static const float _vq_quantthresh__44c1_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c1_s_p2_0[] = {
+static const long _vq_quantmap__44c1_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p2_0 = {
-	_vq_quantthresh__44c1_s_p2_0,
-	_vq_quantmap__44c1_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p2_0 = {
+	(float *)_vq_quantthresh__44c1_s_p2_0,
+	(long *)_vq_quantmap__44c1_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c1_s_p2_0 = {
+static const static_codebook _44c1_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c1_s_p2_0,
+	(long *)_vq_lengthlist__44c1_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_s_p2_0,
+	(long *)_vq_quantlist__44c1_s_p2_0,
 	NULL,
-	&_vq_auxt__44c1_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p3_0[] = {
+static const long _vq_quantlist__44c1_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -16793,7 +16793,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c1_s_p3_0[] = {
+static const long _vq_lengthlist__44c1_s_p3_0[] = {
 	 1, 3, 2, 7, 7, 0, 0, 0, 0, 0,13,13, 6, 6, 0, 0,
 	 0, 0, 0,12, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -16802,34 +16802,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_s_p3_0[] = {
+static const float _vq_quantthresh__44c1_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c1_s_p3_0[] = {
+static const long _vq_quantmap__44c1_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p3_0 = {
-	_vq_quantthresh__44c1_s_p3_0,
-	_vq_quantmap__44c1_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p3_0 = {
+	(float *)_vq_quantthresh__44c1_s_p3_0,
+	(long *)_vq_quantmap__44c1_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c1_s_p3_0 = {
+static const static_codebook _44c1_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c1_s_p3_0,
+	(long *)_vq_lengthlist__44c1_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_s_p3_0,
+	(long *)_vq_quantlist__44c1_s_p3_0,
 	NULL,
-	&_vq_auxt__44c1_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p4_0[] = {
+static const long _vq_quantlist__44c1_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -16841,7 +16841,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c1_s_p4_0[] = {
+static const long _vq_lengthlist__44c1_s_p4_0[] = {
 	 1, 3, 3, 6, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7,
 	 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
@@ -16850,34 +16850,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44c1_s_p4_0[] = {
+static const float _vq_quantthresh__44c1_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c1_s_p4_0[] = {
+static const long _vq_quantmap__44c1_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p4_0 = {
-	_vq_quantthresh__44c1_s_p4_0,
-	_vq_quantmap__44c1_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p4_0 = {
+	(float *)_vq_quantthresh__44c1_s_p4_0,
+	(long *)_vq_quantmap__44c1_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c1_s_p4_0 = {
+static const static_codebook _44c1_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c1_s_p4_0,
+	(long *)_vq_lengthlist__44c1_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_s_p4_0,
+	(long *)_vq_quantlist__44c1_s_p4_0,
 	NULL,
-	&_vq_auxt__44c1_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p5_0[] = {
+static const long _vq_quantlist__44c1_s_p5_0[] = {
 	8,
 	7,
 	9,
@@ -16897,7 +16897,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c1_s_p5_0[] = {
+static const long _vq_lengthlist__44c1_s_p5_0[] = {
 	 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,
 	11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -16919,42 +16919,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44c1_s_p5_0[] = {
+static const float _vq_quantthresh__44c1_s_p5_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__44c1_s_p5_0[] = {
+static const long _vq_quantmap__44c1_s_p5_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p5_0 = {
-	_vq_quantthresh__44c1_s_p5_0,
-	_vq_quantmap__44c1_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p5_0 = {
+	(float *)_vq_quantthresh__44c1_s_p5_0,
+	(long *)_vq_quantmap__44c1_s_p5_0,
 	17,
 	17
 };
 
-static static_codebook _44c1_s_p5_0 = {
+static const static_codebook _44c1_s_p5_0 = {
 	2, 289,
-	_vq_lengthlist__44c1_s_p5_0,
+	(long *)_vq_lengthlist__44c1_s_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_s_p5_0,
+	(long *)_vq_quantlist__44c1_s_p5_0,
 	NULL,
-	&_vq_auxt__44c1_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p6_0[] = {
+static const long _vq_quantlist__44c1_s_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c1_s_p6_0[] = {
+static const long _vq_lengthlist__44c1_s_p6_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 6,10,10,11,11,
 	11,11,10,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
@@ -16963,33 +16963,33 @@
 	11,
 };
 
-static float _vq_quantthresh__44c1_s_p6_0[] = {
+static const float _vq_quantthresh__44c1_s_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c1_s_p6_0[] = {
+static const long _vq_quantmap__44c1_s_p6_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p6_0 = {
-	_vq_quantthresh__44c1_s_p6_0,
-	_vq_quantmap__44c1_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p6_0 = {
+	(float *)_vq_quantthresh__44c1_s_p6_0,
+	(long *)_vq_quantmap__44c1_s_p6_0,
 	3,
 	3
 };
 
-static static_codebook _44c1_s_p6_0 = {
+static const static_codebook _44c1_s_p6_0 = {
 	4, 81,
-	_vq_lengthlist__44c1_s_p6_0,
+	(long *)_vq_lengthlist__44c1_s_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c1_s_p6_0,
+	(long *)_vq_quantlist__44c1_s_p6_0,
 	NULL,
-	&_vq_auxt__44c1_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p6_1[] = {
+static const long _vq_quantlist__44c1_s_p6_1[] = {
 	5,
 	4,
 	6,
@@ -17003,7 +17003,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c1_s_p6_1[] = {
+static const long _vq_lengthlist__44c1_s_p6_1[] = {
 	 2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6,
 	 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8,
 	 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7,
@@ -17014,35 +17014,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c1_s_p6_1[] = {
+static const float _vq_quantthresh__44c1_s_p6_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__44c1_s_p6_1[] = {
+static const long _vq_quantmap__44c1_s_p6_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p6_1 = {
-	_vq_quantthresh__44c1_s_p6_1,
-	_vq_quantmap__44c1_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p6_1 = {
+	(float *)_vq_quantthresh__44c1_s_p6_1,
+	(long *)_vq_quantmap__44c1_s_p6_1,
 	11,
 	11
 };
 
-static static_codebook _44c1_s_p6_1 = {
+static const static_codebook _44c1_s_p6_1 = {
 	2, 121,
-	_vq_lengthlist__44c1_s_p6_1,
+	(long *)_vq_lengthlist__44c1_s_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c1_s_p6_1,
+	(long *)_vq_quantlist__44c1_s_p6_1,
 	NULL,
-	&_vq_auxt__44c1_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p7_0[] = {
+static const long _vq_quantlist__44c1_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -17058,7 +17058,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_s_p7_0[] = {
+static const long _vq_lengthlist__44c1_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 9, 7, 5, 6,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8,
 	 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -17072,35 +17072,35 @@
 	 0,12,11,11,11,13,10,14,13,
 };
 
-static float _vq_quantthresh__44c1_s_p7_0[] = {
+static const float _vq_quantthresh__44c1_s_p7_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__44c1_s_p7_0[] = {
+static const long _vq_quantmap__44c1_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p7_0 = {
-	_vq_quantthresh__44c1_s_p7_0,
-	_vq_quantmap__44c1_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p7_0 = {
+	(float *)_vq_quantthresh__44c1_s_p7_0,
+	(long *)_vq_quantmap__44c1_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c1_s_p7_0 = {
+static const static_codebook _44c1_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c1_s_p7_0,
+	(long *)_vq_lengthlist__44c1_s_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c1_s_p7_0,
+	(long *)_vq_quantlist__44c1_s_p7_0,
 	NULL,
-	&_vq_auxt__44c1_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p7_1[] = {
+static const long _vq_quantlist__44c1_s_p7_1[] = {
 	2,
 	1,
 	3,
@@ -17108,38 +17108,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c1_s_p7_1[] = {
+static const long _vq_lengthlist__44c1_s_p7_1[] = {
 	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c1_s_p7_1[] = {
+static const float _vq_quantthresh__44c1_s_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c1_s_p7_1[] = {
+static const long _vq_quantmap__44c1_s_p7_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p7_1 = {
-	_vq_quantthresh__44c1_s_p7_1,
-	_vq_quantmap__44c1_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p7_1 = {
+	(float *)_vq_quantthresh__44c1_s_p7_1,
+	(long *)_vq_quantmap__44c1_s_p7_1,
 	5,
 	5
 };
 
-static static_codebook _44c1_s_p7_1 = {
+static const static_codebook _44c1_s_p7_1 = {
 	2, 25,
-	_vq_lengthlist__44c1_s_p7_1,
+	(long *)_vq_lengthlist__44c1_s_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_s_p7_1,
+	(long *)_vq_quantlist__44c1_s_p7_1,
 	NULL,
-	&_vq_auxt__44c1_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p8_0[] = {
+static const long _vq_quantlist__44c1_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -17155,7 +17155,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_s_p8_0[] = {
+static const long _vq_lengthlist__44c1_s_p8_0[] = {
 	 1, 4, 3,10,10,10,10,10,10,10,10,10,10, 4, 8, 6,
 	10,10,10,10,10,10,10,10,10,10, 4, 8, 7,10,10,10,
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
@@ -17169,35 +17169,35 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c1_s_p8_0[] = {
+static const float _vq_quantthresh__44c1_s_p8_0[] = {
 	-1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 
 	552.5, 773.5, 994.5, 1215.5, 
 };
 
-static long _vq_quantmap__44c1_s_p8_0[] = {
+static const long _vq_quantmap__44c1_s_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_0 = {
-	_vq_quantthresh__44c1_s_p8_0,
-	_vq_quantmap__44c1_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p8_0 = {
+	(float *)_vq_quantthresh__44c1_s_p8_0,
+	(long *)_vq_quantmap__44c1_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c1_s_p8_0 = {
+static const static_codebook _44c1_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c1_s_p8_0,
+	(long *)_vq_lengthlist__44c1_s_p8_0,
 	1, -514541568, 1627103232, 4, 0,
-	_vq_quantlist__44c1_s_p8_0,
+	(long *)_vq_quantlist__44c1_s_p8_0,
 	NULL,
-	&_vq_auxt__44c1_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p8_1[] = {
+static const long _vq_quantlist__44c1_s_p8_1[] = {
 	6,
 	5,
 	7,
@@ -17213,7 +17213,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_s_p8_1[] = {
+static const long _vq_lengthlist__44c1_s_p8_1[] = {
 	 1, 4, 4, 6, 5, 7, 7, 9, 9,10,10,12,12, 6, 5, 5,
 	 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8,
 	 8,10,10,11,11,12,12,15, 7, 7, 8, 8, 9, 9,11,11,
@@ -17227,35 +17227,35 @@
 	16,13,12,12,11,14,12,15,13,
 };
 
-static float _vq_quantthresh__44c1_s_p8_1[] = {
+static const float _vq_quantthresh__44c1_s_p8_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44c1_s_p8_1[] = {
+static const long _vq_quantmap__44c1_s_p8_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_1 = {
-	_vq_quantthresh__44c1_s_p8_1,
-	_vq_quantmap__44c1_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p8_1 = {
+	(float *)_vq_quantthresh__44c1_s_p8_1,
+	(long *)_vq_quantmap__44c1_s_p8_1,
 	13,
 	13
 };
 
-static static_codebook _44c1_s_p8_1 = {
+static const static_codebook _44c1_s_p8_1 = {
 	2, 169,
-	_vq_lengthlist__44c1_s_p8_1,
+	(long *)_vq_lengthlist__44c1_s_p8_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c1_s_p8_1,
+	(long *)_vq_quantlist__44c1_s_p8_1,
 	NULL,
-	&_vq_auxt__44c1_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p8_2[] = {
+static const long _vq_quantlist__44c1_s_p8_2[] = {
 	8,
 	7,
 	9,
@@ -17275,7 +17275,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c1_s_p8_2[] = {
+static const long _vq_lengthlist__44c1_s_p8_2[] = {
 	 2, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9,10,10,10, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9,
@@ -17297,36 +17297,36 @@
 	 9,
 };
 
-static float _vq_quantthresh__44c1_s_p8_2[] = {
+static const float _vq_quantthresh__44c1_s_p8_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__44c1_s_p8_2[] = {
+static const long _vq_quantmap__44c1_s_p8_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_2 = {
-	_vq_quantthresh__44c1_s_p8_2,
-	_vq_quantmap__44c1_s_p8_2,
+static const encode_aux_threshmatch _vq_auxt__44c1_s_p8_2 = {
+	(float *)_vq_quantthresh__44c1_s_p8_2,
+	(long *)_vq_quantmap__44c1_s_p8_2,
 	17,
 	17
 };
 
-static static_codebook _44c1_s_p8_2 = {
+static const static_codebook _44c1_s_p8_2 = {
 	2, 289,
-	_vq_lengthlist__44c1_s_p8_2,
+	(long *)_vq_lengthlist__44c1_s_p8_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_s_p8_2,
+	(long *)_vq_quantlist__44c1_s_p8_2,
 	NULL,
-	&_vq_auxt__44c1_s_p8_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c1_s_short[] = {
+static const long _huff_lengthlist__44c1_s_short[] = {
 	 6, 8,13,12,13,14,15,16,16, 4, 2, 4, 7, 6, 8,11,
 	13,15,10, 4, 4, 8, 6, 8,11,14,17,11, 5, 6, 5, 6,
 	 8,12,14,17,11, 5, 5, 6, 5, 7,10,13,16,12, 6, 7,
@@ -17335,9 +17335,9 @@
 	11,
 };
 
-static static_codebook _huff_book__44c1_s_short = {
+static const static_codebook _huff_book__44c1_s_short = {
 	2, 81,
-	_huff_lengthlist__44c1_s_short,
+	(long *)_huff_lengthlist__44c1_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -17346,7 +17346,7 @@
 	0
 };
 
-static long _huff_lengthlist__44c1_sm_long[] = {
+static const long _huff_lengthlist__44c1_sm_long[] = {
 	 5, 4, 8,10, 9, 9,10,11,12, 4, 2, 5, 6, 6, 8,10,
 	11,13, 8, 4, 6, 8, 7, 9,12,12,14,10, 6, 8, 4, 5,
 	 6, 9,11,12, 9, 5, 6, 5, 5, 6, 9,11,11, 9, 7, 9,
@@ -17355,9 +17355,9 @@
 	11,
 };
 
-static static_codebook _huff_book__44c1_sm_long = {
+static const static_codebook _huff_book__44c1_sm_long = {
 	2, 81,
-	_huff_lengthlist__44c1_sm_long,
+	(long *)_huff_lengthlist__44c1_sm_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -17366,13 +17366,13 @@
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p1_0[] = {
+static const long _vq_quantlist__44c1_sm_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c1_sm_p1_0[] = {
+static const long _vq_lengthlist__44c1_sm_p1_0[] = {
 	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17786,33 +17786,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_sm_p1_0[] = {
+static const float _vq_quantthresh__44c1_sm_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p1_0[] = {
+static const long _vq_quantmap__44c1_sm_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p1_0 = {
-	_vq_quantthresh__44c1_sm_p1_0,
-	_vq_quantmap__44c1_sm_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p1_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p1_0,
+	(long *)_vq_quantmap__44c1_sm_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c1_sm_p1_0 = {
+static const static_codebook _44c1_sm_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c1_sm_p1_0,
+	(long *)_vq_lengthlist__44c1_sm_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c1_sm_p1_0,
+	(long *)_vq_quantlist__44c1_sm_p1_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p2_0[] = {
+static const long _vq_quantlist__44c1_sm_p2_0[] = {
 	2,
 	1,
 	3,
@@ -17820,7 +17820,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c1_sm_p2_0[] = {
+static const long _vq_lengthlist__44c1_sm_p2_0[] = {
 	 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17863,33 +17863,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_sm_p2_0[] = {
+static const float _vq_quantthresh__44c1_sm_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p2_0[] = {
+static const long _vq_quantmap__44c1_sm_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p2_0 = {
-	_vq_quantthresh__44c1_sm_p2_0,
-	_vq_quantmap__44c1_sm_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p2_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p2_0,
+	(long *)_vq_quantmap__44c1_sm_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c1_sm_p2_0 = {
+static const static_codebook _44c1_sm_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c1_sm_p2_0,
+	(long *)_vq_lengthlist__44c1_sm_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_sm_p2_0,
+	(long *)_vq_quantlist__44c1_sm_p2_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p3_0[] = {
+static const long _vq_quantlist__44c1_sm_p3_0[] = {
 	4,
 	3,
 	5,
@@ -17901,7 +17901,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c1_sm_p3_0[] = {
+static const long _vq_lengthlist__44c1_sm_p3_0[] = {
 	 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0,
 	 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 7, 7, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -17910,34 +17910,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_sm_p3_0[] = {
+static const float _vq_quantthresh__44c1_sm_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p3_0[] = {
+static const long _vq_quantmap__44c1_sm_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p3_0 = {
-	_vq_quantthresh__44c1_sm_p3_0,
-	_vq_quantmap__44c1_sm_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p3_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p3_0,
+	(long *)_vq_quantmap__44c1_sm_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44c1_sm_p3_0 = {
+static const static_codebook _44c1_sm_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44c1_sm_p3_0,
+	(long *)_vq_lengthlist__44c1_sm_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_sm_p3_0,
+	(long *)_vq_quantlist__44c1_sm_p3_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p4_0[] = {
+static const long _vq_quantlist__44c1_sm_p4_0[] = {
 	4,
 	3,
 	5,
@@ -17949,7 +17949,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44c1_sm_p4_0[] = {
+static const long _vq_lengthlist__44c1_sm_p4_0[] = {
 	 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 8, 8,
 	 9, 9, 0, 6, 6, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8,
 	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
@@ -17958,34 +17958,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44c1_sm_p4_0[] = {
+static const float _vq_quantthresh__44c1_sm_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p4_0[] = {
+static const long _vq_quantmap__44c1_sm_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p4_0 = {
-	_vq_quantthresh__44c1_sm_p4_0,
-	_vq_quantmap__44c1_sm_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p4_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p4_0,
+	(long *)_vq_quantmap__44c1_sm_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c1_sm_p4_0 = {
+static const static_codebook _44c1_sm_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c1_sm_p4_0,
+	(long *)_vq_lengthlist__44c1_sm_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_sm_p4_0,
+	(long *)_vq_quantlist__44c1_sm_p4_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p5_0[] = {
+static const long _vq_quantlist__44c1_sm_p5_0[] = {
 	8,
 	7,
 	9,
@@ -18005,7 +18005,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c1_sm_p5_0[] = {
+static const long _vq_lengthlist__44c1_sm_p5_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10,
 	11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -18027,42 +18027,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44c1_sm_p5_0[] = {
+static const float _vq_quantthresh__44c1_sm_p5_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__44c1_sm_p5_0[] = {
+static const long _vq_quantmap__44c1_sm_p5_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p5_0 = {
-	_vq_quantthresh__44c1_sm_p5_0,
-	_vq_quantmap__44c1_sm_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p5_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p5_0,
+	(long *)_vq_quantmap__44c1_sm_p5_0,
 	17,
 	17
 };
 
-static static_codebook _44c1_sm_p5_0 = {
+static const static_codebook _44c1_sm_p5_0 = {
 	2, 289,
-	_vq_lengthlist__44c1_sm_p5_0,
+	(long *)_vq_lengthlist__44c1_sm_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_sm_p5_0,
+	(long *)_vq_quantlist__44c1_sm_p5_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p6_0[] = {
+static const long _vq_quantlist__44c1_sm_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c1_sm_p6_0[] = {
+static const long _vq_lengthlist__44c1_sm_p6_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11,
 	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11,
 	11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9,
@@ -18071,33 +18071,33 @@
 	11,
 };
 
-static float _vq_quantthresh__44c1_sm_p6_0[] = {
+static const float _vq_quantthresh__44c1_sm_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p6_0[] = {
+static const long _vq_quantmap__44c1_sm_p6_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p6_0 = {
-	_vq_quantthresh__44c1_sm_p6_0,
-	_vq_quantmap__44c1_sm_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p6_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p6_0,
+	(long *)_vq_quantmap__44c1_sm_p6_0,
 	3,
 	3
 };
 
-static static_codebook _44c1_sm_p6_0 = {
+static const static_codebook _44c1_sm_p6_0 = {
 	4, 81,
-	_vq_lengthlist__44c1_sm_p6_0,
+	(long *)_vq_lengthlist__44c1_sm_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c1_sm_p6_0,
+	(long *)_vq_quantlist__44c1_sm_p6_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p6_1[] = {
+static const long _vq_quantlist__44c1_sm_p6_1[] = {
 	5,
 	4,
 	6,
@@ -18111,7 +18111,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44c1_sm_p6_1[] = {
+static const long _vq_lengthlist__44c1_sm_p6_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
@@ -18122,35 +18122,35 @@
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c1_sm_p6_1[] = {
+static const float _vq_quantthresh__44c1_sm_p6_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__44c1_sm_p6_1[] = {
+static const long _vq_quantmap__44c1_sm_p6_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p6_1 = {
-	_vq_quantthresh__44c1_sm_p6_1,
-	_vq_quantmap__44c1_sm_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p6_1 = {
+	(float *)_vq_quantthresh__44c1_sm_p6_1,
+	(long *)_vq_quantmap__44c1_sm_p6_1,
 	11,
 	11
 };
 
-static static_codebook _44c1_sm_p6_1 = {
+static const static_codebook _44c1_sm_p6_1 = {
 	2, 121,
-	_vq_lengthlist__44c1_sm_p6_1,
+	(long *)_vq_lengthlist__44c1_sm_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c1_sm_p6_1,
+	(long *)_vq_quantlist__44c1_sm_p6_1,
 	NULL,
-	&_vq_auxt__44c1_sm_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p7_0[] = {
+static const long _vq_quantlist__44c1_sm_p7_0[] = {
 	6,
 	5,
 	7,
@@ -18166,7 +18166,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_sm_p7_0[] = {
+static const long _vq_lengthlist__44c1_sm_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8,
 	 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -18180,35 +18180,35 @@
 	 0,12,12,11,11,13,12,14,13,
 };
 
-static float _vq_quantthresh__44c1_sm_p7_0[] = {
+static const float _vq_quantthresh__44c1_sm_p7_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__44c1_sm_p7_0[] = {
+static const long _vq_quantmap__44c1_sm_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p7_0 = {
-	_vq_quantthresh__44c1_sm_p7_0,
-	_vq_quantmap__44c1_sm_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p7_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p7_0,
+	(long *)_vq_quantmap__44c1_sm_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44c1_sm_p7_0 = {
+static const static_codebook _44c1_sm_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44c1_sm_p7_0,
+	(long *)_vq_lengthlist__44c1_sm_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c1_sm_p7_0,
+	(long *)_vq_quantlist__44c1_sm_p7_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p7_1[] = {
+static const long _vq_quantlist__44c1_sm_p7_1[] = {
 	2,
 	1,
 	3,
@@ -18216,38 +18216,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c1_sm_p7_1[] = {
+static const long _vq_lengthlist__44c1_sm_p7_1[] = {
 	 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44c1_sm_p7_1[] = {
+static const float _vq_quantthresh__44c1_sm_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p7_1[] = {
+static const long _vq_quantmap__44c1_sm_p7_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p7_1 = {
-	_vq_quantthresh__44c1_sm_p7_1,
-	_vq_quantmap__44c1_sm_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p7_1 = {
+	(float *)_vq_quantthresh__44c1_sm_p7_1,
+	(long *)_vq_quantmap__44c1_sm_p7_1,
 	5,
 	5
 };
 
-static static_codebook _44c1_sm_p7_1 = {
+static const static_codebook _44c1_sm_p7_1 = {
 	2, 25,
-	_vq_lengthlist__44c1_sm_p7_1,
+	(long *)_vq_lengthlist__44c1_sm_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_sm_p7_1,
+	(long *)_vq_quantlist__44c1_sm_p7_1,
 	NULL,
-	&_vq_auxt__44c1_sm_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p8_0[] = {
+static const long _vq_quantlist__44c1_sm_p8_0[] = {
 	6,
 	5,
 	7,
@@ -18263,7 +18263,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_sm_p8_0[] = {
+static const long _vq_lengthlist__44c1_sm_p8_0[] = {
 	 1, 3, 3,13,13,13,13,13,13,13,13,13,13, 3, 6, 6,
 	13,13,13,13,13,13,13,13,13,13, 4, 8, 7,13,13,13,
 	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
@@ -18277,35 +18277,35 @@
 	13,13,13,13,13,13,13,13,13,
 };
 
-static float _vq_quantthresh__44c1_sm_p8_0[] = {
+static const float _vq_quantthresh__44c1_sm_p8_0[] = {
 	-1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 
 	552.5, 773.5, 994.5, 1215.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p8_0[] = {
+static const long _vq_quantmap__44c1_sm_p8_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_0 = {
-	_vq_quantthresh__44c1_sm_p8_0,
-	_vq_quantmap__44c1_sm_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p8_0 = {
+	(float *)_vq_quantthresh__44c1_sm_p8_0,
+	(long *)_vq_quantmap__44c1_sm_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c1_sm_p8_0 = {
+static const static_codebook _44c1_sm_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c1_sm_p8_0,
+	(long *)_vq_lengthlist__44c1_sm_p8_0,
 	1, -514541568, 1627103232, 4, 0,
-	_vq_quantlist__44c1_sm_p8_0,
+	(long *)_vq_quantlist__44c1_sm_p8_0,
 	NULL,
-	&_vq_auxt__44c1_sm_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p8_1[] = {
+static const long _vq_quantlist__44c1_sm_p8_1[] = {
 	6,
 	5,
 	7,
@@ -18321,7 +18321,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_sm_p8_1[] = {
+static const long _vq_lengthlist__44c1_sm_p8_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5,
 	 7, 7, 8, 7,10,10,11,11,12,12, 6, 5, 5, 7, 7, 8,
 	 8,10,10,11,11,12,12,16, 7, 7, 8, 8, 9, 9,11,11,
@@ -18335,35 +18335,35 @@
 	20,13,12,12,12,14,12,14,13,
 };
 
-static float _vq_quantthresh__44c1_sm_p8_1[] = {
+static const float _vq_quantthresh__44c1_sm_p8_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44c1_sm_p8_1[] = {
+static const long _vq_quantmap__44c1_sm_p8_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_1 = {
-	_vq_quantthresh__44c1_sm_p8_1,
-	_vq_quantmap__44c1_sm_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p8_1 = {
+	(float *)_vq_quantthresh__44c1_sm_p8_1,
+	(long *)_vq_quantmap__44c1_sm_p8_1,
 	13,
 	13
 };
 
-static static_codebook _44c1_sm_p8_1 = {
+static const static_codebook _44c1_sm_p8_1 = {
 	2, 169,
-	_vq_lengthlist__44c1_sm_p8_1,
+	(long *)_vq_lengthlist__44c1_sm_p8_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c1_sm_p8_1,
+	(long *)_vq_quantlist__44c1_sm_p8_1,
 	NULL,
-	&_vq_auxt__44c1_sm_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p8_2[] = {
+static const long _vq_quantlist__44c1_sm_p8_2[] = {
 	8,
 	7,
 	9,
@@ -18383,7 +18383,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44c1_sm_p8_2[] = {
+static const long _vq_lengthlist__44c1_sm_p8_2[] = {
 	 2, 5, 5, 6, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
@@ -18405,36 +18405,36 @@
 	 9,
 };
 
-static float _vq_quantthresh__44c1_sm_p8_2[] = {
+static const float _vq_quantthresh__44c1_sm_p8_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__44c1_sm_p8_2[] = {
+static const long _vq_quantmap__44c1_sm_p8_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_2 = {
-	_vq_quantthresh__44c1_sm_p8_2,
-	_vq_quantmap__44c1_sm_p8_2,
+static const encode_aux_threshmatch _vq_auxt__44c1_sm_p8_2 = {
+	(float *)_vq_quantthresh__44c1_sm_p8_2,
+	(long *)_vq_quantmap__44c1_sm_p8_2,
 	17,
 	17
 };
 
-static static_codebook _44c1_sm_p8_2 = {
+static const static_codebook _44c1_sm_p8_2 = {
 	2, 289,
-	_vq_lengthlist__44c1_sm_p8_2,
+	(long *)_vq_lengthlist__44c1_sm_p8_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_sm_p8_2,
+	(long *)_vq_quantlist__44c1_sm_p8_2,
 	NULL,
-	&_vq_auxt__44c1_sm_p8_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c1_sm_short[] = {
+static const long _huff_lengthlist__44c1_sm_short[] = {
 	 4, 7,13,14,14,15,16,18,18, 4, 2, 5, 8, 7, 9,12,
 	15,15,10, 4, 5,10, 6, 8,11,15,17,12, 5, 7, 5, 6,
 	 8,11,14,17,11, 5, 6, 6, 5, 6, 9,13,17,12, 6, 7,
@@ -18443,9 +18443,9 @@
 	11,
 };
 
-static static_codebook _huff_book__44c1_sm_short = {
+static const static_codebook _huff_book__44c1_sm_short = {
 	2, 81,
-	_huff_lengthlist__44c1_sm_short,
+	(long *)_huff_lengthlist__44c1_sm_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -18454,7 +18454,7 @@
 	0
 };
 
-static long _huff_lengthlist__44cn1_s_long[] = {
+static const long _huff_lengthlist__44cn1_s_long[] = {
 	 4, 4, 7, 8, 7, 8,10,12,17, 3, 1, 6, 6, 7, 8,10,
 	12,15, 7, 6, 9, 9, 9,11,12,14,17, 8, 6, 9, 6, 7,
 	 9,11,13,17, 7, 6, 9, 7, 7, 8, 9,12,15, 8, 8,10,
@@ -18463,9 +18463,9 @@
 	20,
 };
 
-static static_codebook _huff_book__44cn1_s_long = {
+static const static_codebook _huff_book__44cn1_s_long = {
 	2, 81,
-	_huff_lengthlist__44cn1_s_long,
+	(long *)_huff_lengthlist__44cn1_s_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -18474,13 +18474,13 @@
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p1_0[] = {
+static const long _vq_quantlist__44cn1_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44cn1_s_p1_0[] = {
+static const long _vq_lengthlist__44cn1_s_p1_0[] = {
 	 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -18894,33 +18894,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44cn1_s_p1_0[] = {
+static const float _vq_quantthresh__44cn1_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p1_0[] = {
+static const long _vq_quantmap__44cn1_s_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p1_0 = {
-	_vq_quantthresh__44cn1_s_p1_0,
-	_vq_quantmap__44cn1_s_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p1_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p1_0,
+	(long *)_vq_quantmap__44cn1_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44cn1_s_p1_0 = {
+static const static_codebook _44cn1_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44cn1_s_p1_0,
+	(long *)_vq_lengthlist__44cn1_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44cn1_s_p1_0,
+	(long *)_vq_quantlist__44cn1_s_p1_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p2_0[] = {
+static const long _vq_quantlist__44cn1_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -18928,7 +18928,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44cn1_s_p2_0[] = {
+static const long _vq_lengthlist__44cn1_s_p2_0[] = {
 	 1, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -18971,33 +18971,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44cn1_s_p2_0[] = {
+static const float _vq_quantthresh__44cn1_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p2_0[] = {
+static const long _vq_quantmap__44cn1_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p2_0 = {
-	_vq_quantthresh__44cn1_s_p2_0,
-	_vq_quantmap__44cn1_s_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p2_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p2_0,
+	(long *)_vq_quantmap__44cn1_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44cn1_s_p2_0 = {
+static const static_codebook _44cn1_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44cn1_s_p2_0,
+	(long *)_vq_lengthlist__44cn1_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44cn1_s_p2_0,
+	(long *)_vq_quantlist__44cn1_s_p2_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p3_0[] = {
+static const long _vq_quantlist__44cn1_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -19009,7 +19009,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44cn1_s_p3_0[] = {
+static const long _vq_lengthlist__44cn1_s_p3_0[] = {
 	 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
@@ -19018,34 +19018,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44cn1_s_p3_0[] = {
+static const float _vq_quantthresh__44cn1_s_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p3_0[] = {
+static const long _vq_quantmap__44cn1_s_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p3_0 = {
-	_vq_quantthresh__44cn1_s_p3_0,
-	_vq_quantmap__44cn1_s_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p3_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p3_0,
+	(long *)_vq_quantmap__44cn1_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44cn1_s_p3_0 = {
+static const static_codebook _44cn1_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44cn1_s_p3_0,
+	(long *)_vq_lengthlist__44cn1_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44cn1_s_p3_0,
+	(long *)_vq_quantlist__44cn1_s_p3_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p4_0[] = {
+static const long _vq_quantlist__44cn1_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -19057,7 +19057,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44cn1_s_p4_0[] = {
+static const long _vq_lengthlist__44cn1_s_p4_0[] = {
 	 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 6, 6, 7, 7,
 	 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
@@ -19066,34 +19066,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44cn1_s_p4_0[] = {
+static const float _vq_quantthresh__44cn1_s_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p4_0[] = {
+static const long _vq_quantmap__44cn1_s_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p4_0 = {
-	_vq_quantthresh__44cn1_s_p4_0,
-	_vq_quantmap__44cn1_s_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p4_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p4_0,
+	(long *)_vq_quantmap__44cn1_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44cn1_s_p4_0 = {
+static const static_codebook _44cn1_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44cn1_s_p4_0,
+	(long *)_vq_lengthlist__44cn1_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44cn1_s_p4_0,
+	(long *)_vq_quantlist__44cn1_s_p4_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p5_0[] = {
+static const long _vq_quantlist__44cn1_s_p5_0[] = {
 	8,
 	7,
 	9,
@@ -19113,7 +19113,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44cn1_s_p5_0[] = {
+static const long _vq_lengthlist__44cn1_s_p5_0[] = {
 	 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10,
 	10, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,
 	11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
@@ -19135,42 +19135,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44cn1_s_p5_0[] = {
+static const float _vq_quantthresh__44cn1_s_p5_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__44cn1_s_p5_0[] = {
+static const long _vq_quantmap__44cn1_s_p5_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p5_0 = {
-	_vq_quantthresh__44cn1_s_p5_0,
-	_vq_quantmap__44cn1_s_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p5_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p5_0,
+	(long *)_vq_quantmap__44cn1_s_p5_0,
 	17,
 	17
 };
 
-static static_codebook _44cn1_s_p5_0 = {
+static const static_codebook _44cn1_s_p5_0 = {
 	2, 289,
-	_vq_lengthlist__44cn1_s_p5_0,
+	(long *)_vq_lengthlist__44cn1_s_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44cn1_s_p5_0,
+	(long *)_vq_quantlist__44cn1_s_p5_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p6_0[] = {
+static const long _vq_quantlist__44cn1_s_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44cn1_s_p6_0[] = {
+static const long _vq_lengthlist__44cn1_s_p6_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 6, 6,10, 9, 9,11,
 	 9, 9, 4, 6, 6,10, 9, 9,10, 9, 9, 7,10,10,11,11,
 	11,12,11,11, 7, 9, 9,11,11,10,11,10,10, 7, 9, 9,
@@ -19179,33 +19179,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44cn1_s_p6_0[] = {
+static const float _vq_quantthresh__44cn1_s_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p6_0[] = {
+static const long _vq_quantmap__44cn1_s_p6_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p6_0 = {
-	_vq_quantthresh__44cn1_s_p6_0,
-	_vq_quantmap__44cn1_s_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p6_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p6_0,
+	(long *)_vq_quantmap__44cn1_s_p6_0,
 	3,
 	3
 };
 
-static static_codebook _44cn1_s_p6_0 = {
+static const static_codebook _44cn1_s_p6_0 = {
 	4, 81,
-	_vq_lengthlist__44cn1_s_p6_0,
+	(long *)_vq_lengthlist__44cn1_s_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44cn1_s_p6_0,
+	(long *)_vq_quantlist__44cn1_s_p6_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p6_1[] = {
+static const long _vq_quantlist__44cn1_s_p6_1[] = {
 	5,
 	4,
 	6,
@@ -19219,7 +19219,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44cn1_s_p6_1[] = {
+static const long _vq_lengthlist__44cn1_s_p6_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 6,
 	 8, 8, 8, 8, 8, 8,10,10,10, 7, 6, 7, 7, 8, 8, 8,
 	 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
@@ -19230,35 +19230,35 @@
 	10,10,10, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__44cn1_s_p6_1[] = {
+static const float _vq_quantthresh__44cn1_s_p6_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__44cn1_s_p6_1[] = {
+static const long _vq_quantmap__44cn1_s_p6_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p6_1 = {
-	_vq_quantthresh__44cn1_s_p6_1,
-	_vq_quantmap__44cn1_s_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p6_1 = {
+	(float *)_vq_quantthresh__44cn1_s_p6_1,
+	(long *)_vq_quantmap__44cn1_s_p6_1,
 	11,
 	11
 };
 
-static static_codebook _44cn1_s_p6_1 = {
+static const static_codebook _44cn1_s_p6_1 = {
 	2, 121,
-	_vq_lengthlist__44cn1_s_p6_1,
+	(long *)_vq_lengthlist__44cn1_s_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44cn1_s_p6_1,
+	(long *)_vq_quantlist__44cn1_s_p6_1,
 	NULL,
-	&_vq_auxt__44cn1_s_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p7_0[] = {
+static const long _vq_quantlist__44cn1_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -19274,7 +19274,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44cn1_s_p7_0[] = {
+static const long _vq_lengthlist__44cn1_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,11,11, 7, 5, 5, 7, 7, 8,
 	 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -19288,35 +19288,35 @@
 	 0,13,13,12,12,13,13,13,14,
 };
 
-static float _vq_quantthresh__44cn1_s_p7_0[] = {
+static const float _vq_quantthresh__44cn1_s_p7_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__44cn1_s_p7_0[] = {
+static const long _vq_quantmap__44cn1_s_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p7_0 = {
-	_vq_quantthresh__44cn1_s_p7_0,
-	_vq_quantmap__44cn1_s_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p7_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p7_0,
+	(long *)_vq_quantmap__44cn1_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44cn1_s_p7_0 = {
+static const static_codebook _44cn1_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44cn1_s_p7_0,
+	(long *)_vq_lengthlist__44cn1_s_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44cn1_s_p7_0,
+	(long *)_vq_quantlist__44cn1_s_p7_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p7_1[] = {
+static const long _vq_quantlist__44cn1_s_p7_1[] = {
 	2,
 	1,
 	3,
@@ -19324,38 +19324,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44cn1_s_p7_1[] = {
+static const long _vq_lengthlist__44cn1_s_p7_1[] = {
 	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
 	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44cn1_s_p7_1[] = {
+static const float _vq_quantthresh__44cn1_s_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p7_1[] = {
+static const long _vq_quantmap__44cn1_s_p7_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p7_1 = {
-	_vq_quantthresh__44cn1_s_p7_1,
-	_vq_quantmap__44cn1_s_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p7_1 = {
+	(float *)_vq_quantthresh__44cn1_s_p7_1,
+	(long *)_vq_quantmap__44cn1_s_p7_1,
 	5,
 	5
 };
 
-static static_codebook _44cn1_s_p7_1 = {
+static const static_codebook _44cn1_s_p7_1 = {
 	2, 25,
-	_vq_lengthlist__44cn1_s_p7_1,
+	(long *)_vq_lengthlist__44cn1_s_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44cn1_s_p7_1,
+	(long *)_vq_quantlist__44cn1_s_p7_1,
 	NULL,
-	&_vq_auxt__44cn1_s_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p8_0[] = {
+static const long _vq_quantlist__44cn1_s_p8_0[] = {
 	2,
 	1,
 	3,
@@ -19363,7 +19363,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44cn1_s_p8_0[] = {
+static const long _vq_lengthlist__44cn1_s_p8_0[] = {
 	 1, 7, 7,11,11, 8,11,11,11,11, 4,11, 3,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,10,11,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -19406,33 +19406,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44cn1_s_p8_0[] = {
+static const float _vq_quantthresh__44cn1_s_p8_0[] = {
 	-331.5, -110.5, 110.5, 331.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p8_0[] = {
+static const long _vq_quantmap__44cn1_s_p8_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_0 = {
-	_vq_quantthresh__44cn1_s_p8_0,
-	_vq_quantmap__44cn1_s_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p8_0 = {
+	(float *)_vq_quantthresh__44cn1_s_p8_0,
+	(long *)_vq_quantmap__44cn1_s_p8_0,
 	5,
 	5
 };
 
-static static_codebook _44cn1_s_p8_0 = {
+static const static_codebook _44cn1_s_p8_0 = {
 	4, 625,
-	_vq_lengthlist__44cn1_s_p8_0,
+	(long *)_vq_lengthlist__44cn1_s_p8_0,
 	1, -518283264, 1627103232, 3, 0,
-	_vq_quantlist__44cn1_s_p8_0,
+	(long *)_vq_quantlist__44cn1_s_p8_0,
 	NULL,
-	&_vq_auxt__44cn1_s_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p8_1[] = {
+static const long _vq_quantlist__44cn1_s_p8_1[] = {
 	6,
 	5,
 	7,
@@ -19448,7 +19448,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44cn1_s_p8_1[] = {
+static const long _vq_lengthlist__44cn1_s_p8_1[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9,10,10,11,11,11, 6, 5, 5,
 	 7, 7, 8, 8, 9,10, 9,11,11,12, 5, 5, 5, 7, 7, 8,
 	 9,10,10,12,12,14,13,15, 7, 7, 8, 8, 9,10,11,11,
@@ -19462,35 +19462,35 @@
 	15,12,12,11,11,14,12,13,14,
 };
 
-static float _vq_quantthresh__44cn1_s_p8_1[] = {
+static const float _vq_quantthresh__44cn1_s_p8_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44cn1_s_p8_1[] = {
+static const long _vq_quantmap__44cn1_s_p8_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_1 = {
-	_vq_quantthresh__44cn1_s_p8_1,
-	_vq_quantmap__44cn1_s_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p8_1 = {
+	(float *)_vq_quantthresh__44cn1_s_p8_1,
+	(long *)_vq_quantmap__44cn1_s_p8_1,
 	13,
 	13
 };
 
-static static_codebook _44cn1_s_p8_1 = {
+static const static_codebook _44cn1_s_p8_1 = {
 	2, 169,
-	_vq_lengthlist__44cn1_s_p8_1,
+	(long *)_vq_lengthlist__44cn1_s_p8_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44cn1_s_p8_1,
+	(long *)_vq_quantlist__44cn1_s_p8_1,
 	NULL,
-	&_vq_auxt__44cn1_s_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_s_p8_2[] = {
+static const long _vq_quantlist__44cn1_s_p8_2[] = {
 	8,
 	7,
 	9,
@@ -19510,7 +19510,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44cn1_s_p8_2[] = {
+static const long _vq_lengthlist__44cn1_s_p8_2[] = {
 	 3, 4, 3, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9,
 	 9,10,11,11, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9,10,10,10, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9,
@@ -19532,36 +19532,36 @@
 	 9,
 };
 
-static float _vq_quantthresh__44cn1_s_p8_2[] = {
+static const float _vq_quantthresh__44cn1_s_p8_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__44cn1_s_p8_2[] = {
+static const long _vq_quantmap__44cn1_s_p8_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_2 = {
-	_vq_quantthresh__44cn1_s_p8_2,
-	_vq_quantmap__44cn1_s_p8_2,
+static const encode_aux_threshmatch _vq_auxt__44cn1_s_p8_2 = {
+	(float *)_vq_quantthresh__44cn1_s_p8_2,
+	(long *)_vq_quantmap__44cn1_s_p8_2,
 	17,
 	17
 };
 
-static static_codebook _44cn1_s_p8_2 = {
+static const static_codebook _44cn1_s_p8_2 = {
 	2, 289,
-	_vq_lengthlist__44cn1_s_p8_2,
+	(long *)_vq_lengthlist__44cn1_s_p8_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44cn1_s_p8_2,
+	(long *)_vq_quantlist__44cn1_s_p8_2,
 	NULL,
-	&_vq_auxt__44cn1_s_p8_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44cn1_s_short[] = {
+static const long _huff_lengthlist__44cn1_s_short[] = {
 	10, 9,12,15,12,13,16,14,16, 7, 1, 5,14, 7,10,13,
 	16,16, 9, 4, 6,16, 8,11,16,16,16,14, 4, 7,16, 9,
 	12,14,16,16,10, 5, 7,14, 9,12,14,15,15,13, 8, 9,
@@ -19570,9 +19570,9 @@
 	10,
 };
 
-static static_codebook _huff_book__44cn1_s_short = {
+static const static_codebook _huff_book__44cn1_s_short = {
 	2, 81,
-	_huff_lengthlist__44cn1_s_short,
+	(long *)_huff_lengthlist__44cn1_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -19581,7 +19581,7 @@
 	0
 };
 
-static long _huff_lengthlist__44cn1_sm_long[] = {
+static const long _huff_lengthlist__44cn1_sm_long[] = {
 	 3, 3, 8, 8, 8, 8,10,12,14, 3, 2, 6, 7, 7, 8,10,
 	12,16, 7, 6, 7, 9, 8,10,12,14,16, 8, 6, 8, 4, 5,
 	 7, 9,11,13, 7, 6, 8, 5, 6, 7, 9,11,14, 8, 8,10,
@@ -19590,9 +19590,9 @@
 	17,
 };
 
-static static_codebook _huff_book__44cn1_sm_long = {
+static const static_codebook _huff_book__44cn1_sm_long = {
 	2, 81,
-	_huff_lengthlist__44cn1_sm_long,
+	(long *)_huff_lengthlist__44cn1_sm_long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -19601,13 +19601,13 @@
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p1_0[] = {
+static const long _vq_quantlist__44cn1_sm_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44cn1_sm_p1_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p1_0[] = {
 	 1, 4, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -20021,33 +20021,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44cn1_sm_p1_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p1_0[] = {
+static const long _vq_quantmap__44cn1_sm_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p1_0 = {
-	_vq_quantthresh__44cn1_sm_p1_0,
-	_vq_quantmap__44cn1_sm_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p1_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p1_0,
+	(long *)_vq_quantmap__44cn1_sm_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44cn1_sm_p1_0 = {
+static const static_codebook _44cn1_sm_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44cn1_sm_p1_0,
+	(long *)_vq_lengthlist__44cn1_sm_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44cn1_sm_p1_0,
+	(long *)_vq_quantlist__44cn1_sm_p1_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p2_0[] = {
+static const long _vq_quantlist__44cn1_sm_p2_0[] = {
 	2,
 	1,
 	3,
@@ -20055,7 +20055,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44cn1_sm_p2_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p2_0[] = {
 	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -20098,33 +20098,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44cn1_sm_p2_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p2_0[] = {
+static const long _vq_quantmap__44cn1_sm_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p2_0 = {
-	_vq_quantthresh__44cn1_sm_p2_0,
-	_vq_quantmap__44cn1_sm_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p2_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p2_0,
+	(long *)_vq_quantmap__44cn1_sm_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44cn1_sm_p2_0 = {
+static const static_codebook _44cn1_sm_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44cn1_sm_p2_0,
+	(long *)_vq_lengthlist__44cn1_sm_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44cn1_sm_p2_0,
+	(long *)_vq_quantlist__44cn1_sm_p2_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p3_0[] = {
+static const long _vq_quantlist__44cn1_sm_p3_0[] = {
 	4,
 	3,
 	5,
@@ -20136,7 +20136,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44cn1_sm_p3_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p3_0[] = {
 	 1, 3, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
 	 0, 0, 0, 4, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0,
@@ -20145,34 +20145,34 @@
 	 0,
 };
 
-static float _vq_quantthresh__44cn1_sm_p3_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p3_0[] = {
+static const long _vq_quantmap__44cn1_sm_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p3_0 = {
-	_vq_quantthresh__44cn1_sm_p3_0,
-	_vq_quantmap__44cn1_sm_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p3_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p3_0,
+	(long *)_vq_quantmap__44cn1_sm_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44cn1_sm_p3_0 = {
+static const static_codebook _44cn1_sm_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44cn1_sm_p3_0,
+	(long *)_vq_lengthlist__44cn1_sm_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44cn1_sm_p3_0,
+	(long *)_vq_quantlist__44cn1_sm_p3_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p4_0[] = {
+static const long _vq_quantlist__44cn1_sm_p4_0[] = {
 	4,
 	3,
 	5,
@@ -20184,7 +20184,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44cn1_sm_p4_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p4_0[] = {
 	 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7,
 	 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8,
 	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
@@ -20193,34 +20193,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44cn1_sm_p4_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p4_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p4_0[] = {
+static const long _vq_quantmap__44cn1_sm_p4_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p4_0 = {
-	_vq_quantthresh__44cn1_sm_p4_0,
-	_vq_quantmap__44cn1_sm_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p4_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p4_0,
+	(long *)_vq_quantmap__44cn1_sm_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44cn1_sm_p4_0 = {
+static const static_codebook _44cn1_sm_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44cn1_sm_p4_0,
+	(long *)_vq_lengthlist__44cn1_sm_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44cn1_sm_p4_0,
+	(long *)_vq_quantlist__44cn1_sm_p4_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p5_0[] = {
+static const long _vq_quantlist__44cn1_sm_p5_0[] = {
 	8,
 	7,
 	9,
@@ -20240,7 +20240,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44cn1_sm_p5_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p5_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,
 	11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 6, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
@@ -20262,42 +20262,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44cn1_sm_p5_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p5_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__44cn1_sm_p5_0[] = {
+static const long _vq_quantmap__44cn1_sm_p5_0[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p5_0 = {
-	_vq_quantthresh__44cn1_sm_p5_0,
-	_vq_quantmap__44cn1_sm_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p5_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p5_0,
+	(long *)_vq_quantmap__44cn1_sm_p5_0,
 	17,
 	17
 };
 
-static static_codebook _44cn1_sm_p5_0 = {
+static const static_codebook _44cn1_sm_p5_0 = {
 	2, 289,
-	_vq_lengthlist__44cn1_sm_p5_0,
+	(long *)_vq_lengthlist__44cn1_sm_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44cn1_sm_p5_0,
+	(long *)_vq_quantlist__44cn1_sm_p5_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p6_0[] = {
+static const long _vq_quantlist__44cn1_sm_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44cn1_sm_p6_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p6_0[] = {
 	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 6,10, 9, 9,11,
 	 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11,
 	11,11,11,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
@@ -20306,33 +20306,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44cn1_sm_p6_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p6_0[] = {
+static const long _vq_quantmap__44cn1_sm_p6_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_0 = {
-	_vq_quantthresh__44cn1_sm_p6_0,
-	_vq_quantmap__44cn1_sm_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p6_0,
+	(long *)_vq_quantmap__44cn1_sm_p6_0,
 	3,
 	3
 };
 
-static static_codebook _44cn1_sm_p6_0 = {
+static const static_codebook _44cn1_sm_p6_0 = {
 	4, 81,
-	_vq_lengthlist__44cn1_sm_p6_0,
+	(long *)_vq_lengthlist__44cn1_sm_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44cn1_sm_p6_0,
+	(long *)_vq_quantlist__44cn1_sm_p6_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p6_1[] = {
+static const long _vq_quantlist__44cn1_sm_p6_1[] = {
 	5,
 	4,
 	6,
@@ -20346,7 +20346,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44cn1_sm_p6_1[] = {
+static const long _vq_lengthlist__44cn1_sm_p6_1[] = {
 	 2, 4, 4, 5, 5, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
@@ -20357,35 +20357,35 @@
 	10,10,10, 8, 9, 8, 8, 9, 8,
 };
 
-static float _vq_quantthresh__44cn1_sm_p6_1[] = {
+static const float _vq_quantthresh__44cn1_sm_p6_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__44cn1_sm_p6_1[] = {
+static const long _vq_quantmap__44cn1_sm_p6_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_1 = {
-	_vq_quantthresh__44cn1_sm_p6_1,
-	_vq_quantmap__44cn1_sm_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_1 = {
+	(float *)_vq_quantthresh__44cn1_sm_p6_1,
+	(long *)_vq_quantmap__44cn1_sm_p6_1,
 	11,
 	11
 };
 
-static static_codebook _44cn1_sm_p6_1 = {
+static const static_codebook _44cn1_sm_p6_1 = {
 	2, 121,
-	_vq_lengthlist__44cn1_sm_p6_1,
+	(long *)_vq_lengthlist__44cn1_sm_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44cn1_sm_p6_1,
+	(long *)_vq_quantlist__44cn1_sm_p6_1,
 	NULL,
-	&_vq_auxt__44cn1_sm_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p7_0[] = {
+static const long _vq_quantlist__44cn1_sm_p7_0[] = {
 	6,
 	5,
 	7,
@@ -20401,7 +20401,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44cn1_sm_p7_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p7_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 7, 7, 9, 9,10,10, 7, 5, 5,
 	 7, 7, 8, 8, 8, 8,10, 9,11,10, 7, 5, 5, 7, 7, 8,
 	 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
@@ -20415,35 +20415,35 @@
 	 0,13,12,12,12,13,13,13,14,
 };
 
-static float _vq_quantthresh__44cn1_sm_p7_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p7_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__44cn1_sm_p7_0[] = {
+static const long _vq_quantmap__44cn1_sm_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_0 = {
-	_vq_quantthresh__44cn1_sm_p7_0,
-	_vq_quantmap__44cn1_sm_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p7_0,
+	(long *)_vq_quantmap__44cn1_sm_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44cn1_sm_p7_0 = {
+static const static_codebook _44cn1_sm_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44cn1_sm_p7_0,
+	(long *)_vq_lengthlist__44cn1_sm_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44cn1_sm_p7_0,
+	(long *)_vq_quantlist__44cn1_sm_p7_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p7_1[] = {
+static const long _vq_quantlist__44cn1_sm_p7_1[] = {
 	2,
 	1,
 	3,
@@ -20451,38 +20451,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44cn1_sm_p7_1[] = {
+static const long _vq_lengthlist__44cn1_sm_p7_1[] = {
 	 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static float _vq_quantthresh__44cn1_sm_p7_1[] = {
+static const float _vq_quantthresh__44cn1_sm_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p7_1[] = {
+static const long _vq_quantmap__44cn1_sm_p7_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_1 = {
-	_vq_quantthresh__44cn1_sm_p7_1,
-	_vq_quantmap__44cn1_sm_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_1 = {
+	(float *)_vq_quantthresh__44cn1_sm_p7_1,
+	(long *)_vq_quantmap__44cn1_sm_p7_1,
 	5,
 	5
 };
 
-static static_codebook _44cn1_sm_p7_1 = {
+static const static_codebook _44cn1_sm_p7_1 = {
 	2, 25,
-	_vq_lengthlist__44cn1_sm_p7_1,
+	(long *)_vq_lengthlist__44cn1_sm_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44cn1_sm_p7_1,
+	(long *)_vq_quantlist__44cn1_sm_p7_1,
 	NULL,
-	&_vq_auxt__44cn1_sm_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p8_0[] = {
+static const long _vq_quantlist__44cn1_sm_p8_0[] = {
 	4,
 	3,
 	5,
@@ -20494,7 +20494,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44cn1_sm_p8_0[] = {
+static const long _vq_lengthlist__44cn1_sm_p8_0[] = {
 	 1, 4, 4,12,11,13,13,14,14, 4, 7, 7,11,13,14,14,
 	14,14, 3, 8, 3,14,14,14,14,14,14,14,10,12,14,14,
 	14,14,14,14,14,14, 5,14, 8,14,14,14,14,14,12,14,
@@ -20503,34 +20503,34 @@
 	14,
 };
 
-static float _vq_quantthresh__44cn1_sm_p8_0[] = {
+static const float _vq_quantthresh__44cn1_sm_p8_0[] = {
 	-773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 552.5, 773.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p8_0[] = {
+static const long _vq_quantmap__44cn1_sm_p8_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_0 = {
-	_vq_quantthresh__44cn1_sm_p8_0,
-	_vq_quantmap__44cn1_sm_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_0 = {
+	(float *)_vq_quantthresh__44cn1_sm_p8_0,
+	(long *)_vq_quantmap__44cn1_sm_p8_0,
 	9,
 	9
 };
 
-static static_codebook _44cn1_sm_p8_0 = {
+static const static_codebook _44cn1_sm_p8_0 = {
 	2, 81,
-	_vq_lengthlist__44cn1_sm_p8_0,
+	(long *)_vq_lengthlist__44cn1_sm_p8_0,
 	1, -516186112, 1627103232, 4, 0,
-	_vq_quantlist__44cn1_sm_p8_0,
+	(long *)_vq_quantlist__44cn1_sm_p8_0,
 	NULL,
-	&_vq_auxt__44cn1_sm_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p8_1[] = {
+static const long _vq_quantlist__44cn1_sm_p8_1[] = {
 	6,
 	5,
 	7,
@@ -20546,7 +20546,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44cn1_sm_p8_1[] = {
+static const long _vq_lengthlist__44cn1_sm_p8_1[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,11,11, 6, 5, 5,
 	 7, 7, 8, 8,10,10,10,11,11,11, 6, 5, 5, 7, 7, 8,
 	 8,10,10,11,12,12,12,14, 7, 7, 7, 8, 9, 9,11,11,
@@ -20560,35 +20560,35 @@
 	17,12,12,11,10,13,11,13,13,
 };
 
-static float _vq_quantthresh__44cn1_sm_p8_1[] = {
+static const float _vq_quantthresh__44cn1_sm_p8_1[] = {
 	-93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, 
 	42.5, 59.5, 76.5, 93.5, 
 };
 
-static long _vq_quantmap__44cn1_sm_p8_1[] = {
+static const long _vq_quantmap__44cn1_sm_p8_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_1 = {
-	_vq_quantthresh__44cn1_sm_p8_1,
-	_vq_quantmap__44cn1_sm_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_1 = {
+	(float *)_vq_quantthresh__44cn1_sm_p8_1,
+	(long *)_vq_quantmap__44cn1_sm_p8_1,
 	13,
 	13
 };
 
-static static_codebook _44cn1_sm_p8_1 = {
+static const static_codebook _44cn1_sm_p8_1 = {
 	2, 169,
-	_vq_lengthlist__44cn1_sm_p8_1,
+	(long *)_vq_lengthlist__44cn1_sm_p8_1,
 	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44cn1_sm_p8_1,
+	(long *)_vq_quantlist__44cn1_sm_p8_1,
 	NULL,
-	&_vq_auxt__44cn1_sm_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44cn1_sm_p8_2[] = {
+static const long _vq_quantlist__44cn1_sm_p8_2[] = {
 	8,
 	7,
 	9,
@@ -20608,7 +20608,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44cn1_sm_p8_2[] = {
+static const long _vq_lengthlist__44cn1_sm_p8_2[] = {
 	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9,
@@ -20630,36 +20630,36 @@
 	 9,
 };
 
-static float _vq_quantthresh__44cn1_sm_p8_2[] = {
+static const float _vq_quantthresh__44cn1_sm_p8_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__44cn1_sm_p8_2[] = {
+static const long _vq_quantmap__44cn1_sm_p8_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_2 = {
-	_vq_quantthresh__44cn1_sm_p8_2,
-	_vq_quantmap__44cn1_sm_p8_2,
+static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_2 = {
+	(float *)_vq_quantthresh__44cn1_sm_p8_2,
+	(long *)_vq_quantmap__44cn1_sm_p8_2,
 	17,
 	17
 };
 
-static static_codebook _44cn1_sm_p8_2 = {
+static const static_codebook _44cn1_sm_p8_2 = {
 	2, 289,
-	_vq_lengthlist__44cn1_sm_p8_2,
+	(long *)_vq_lengthlist__44cn1_sm_p8_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44cn1_sm_p8_2,
+	(long *)_vq_quantlist__44cn1_sm_p8_2,
 	NULL,
-	&_vq_auxt__44cn1_sm_p8_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44cn1_sm_short[] = {
+static const long _huff_lengthlist__44cn1_sm_short[] = {
 	 5, 6,12,14,12,14,16,17,18, 4, 2, 5,11, 7,10,12,
 	14,15, 9, 4, 5,11, 7,10,13,15,18,15, 6, 7, 5, 6,
 	 8,11,13,16,11, 5, 6, 5, 5, 6, 9,13,15,12, 5, 7,
@@ -20668,9 +20668,9 @@
 	 9,
 };
 
-static static_codebook _huff_book__44cn1_sm_short = {
+static const static_codebook _huff_book__44cn1_sm_short = {
 	2, 81,
-	_huff_lengthlist__44cn1_sm_short,
+	(long *)_huff_lengthlist__44cn1_sm_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,

Modified: trunk/vorbis/lib/books/floor/floor_books.h
===================================================================
--- trunk/vorbis/lib/books/floor/floor_books.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/books/floor/floor_books.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -17,13 +17,13 @@
 
 #include "codebook.h"
 
-static long _huff_lengthlist_line_256x7_0sub1[] = {
+static const long _huff_lengthlist_line_256x7_0sub1[] = {
 	 0, 2, 3, 3, 3, 3, 4, 3, 4,
 };
 
-static static_codebook _huff_book_line_256x7_0sub1 = {
+static const static_codebook _huff_book_line_256x7_0sub1 = {
 	1, 9,
-	_huff_lengthlist_line_256x7_0sub1,
+	(long *)_huff_lengthlist_line_256x7_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -32,14 +32,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_0sub2[] = {
+static const long _huff_lengthlist_line_256x7_0sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 5, 3,
 	 6, 3, 6, 4, 6, 4, 7, 5, 7,
 };
 
-static static_codebook _huff_book_line_256x7_0sub2 = {
+static const static_codebook _huff_book_line_256x7_0sub2 = {
 	1, 25,
-	_huff_lengthlist_line_256x7_0sub2,
+	(long *)_huff_lengthlist_line_256x7_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -48,16 +48,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_0sub3[] = {
+static const long _huff_lengthlist_line_256x7_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 2, 5, 3, 5, 3,
 	 6, 3, 6, 4, 7, 6, 7, 8, 7, 9, 8, 9, 9, 9,10, 9,
 	11,13,11,13,10,10,13,13,13,13,13,13,12,12,12,12,
 };
 
-static static_codebook _huff_book_line_256x7_0sub3 = {
+static const static_codebook _huff_book_line_256x7_0sub3 = {
 	1, 64,
-	_huff_lengthlist_line_256x7_0sub3,
+	(long *)_huff_lengthlist_line_256x7_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -66,13 +66,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_1sub1[] = {
+static const long _huff_lengthlist_line_256x7_1sub1[] = {
 	 0, 3, 3, 3, 3, 2, 4, 3, 4,
 };
 
-static static_codebook _huff_book_line_256x7_1sub1 = {
+static const static_codebook _huff_book_line_256x7_1sub1 = {
 	1, 9,
-	_huff_lengthlist_line_256x7_1sub1,
+	(long *)_huff_lengthlist_line_256x7_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -81,14 +81,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_1sub2[] = {
+static const long _huff_lengthlist_line_256x7_1sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 4, 4,
 	 5, 4, 6, 5, 6, 7, 6, 8, 8,
 };
 
-static static_codebook _huff_book_line_256x7_1sub2 = {
+static const static_codebook _huff_book_line_256x7_1sub2 = {
 	1, 25,
-	_huff_lengthlist_line_256x7_1sub2,
+	(long *)_huff_lengthlist_line_256x7_1sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -97,16 +97,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_1sub3[] = {
+static const long _huff_lengthlist_line_256x7_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 3, 6, 3, 7,
 	 3, 8, 5, 8, 6, 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,
 };
 
-static static_codebook _huff_book_line_256x7_1sub3 = {
+static const static_codebook _huff_book_line_256x7_1sub3 = {
 	1, 64,
-	_huff_lengthlist_line_256x7_1sub3,
+	(long *)_huff_lengthlist_line_256x7_1sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -115,16 +115,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_class0[] = {
+static const long _huff_lengthlist_line_256x7_class0[] = {
 	 7, 5, 5, 9, 9, 6, 6, 9,12, 8, 7, 8,11, 8, 9,15,
 	 6, 3, 3, 7, 7, 4, 3, 6, 9, 6, 5, 6, 8, 6, 8,15,
 	 8, 5, 5, 9, 8, 5, 4, 6,10, 7, 5, 5,11, 8, 7,15,
 	14,15,13,13,13,13, 8,11,15,10, 7, 6,11, 9,10,15,
 };
 
-static static_codebook _huff_book_line_256x7_class0 = {
+static const static_codebook _huff_book_line_256x7_class0 = {
 	1, 64,
-	_huff_lengthlist_line_256x7_class0,
+	(long *)_huff_lengthlist_line_256x7_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -133,7 +133,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_class1[] = {
+static const long _huff_lengthlist_line_256x7_class1[] = {
 	 5, 6, 8,15, 6, 9,10,15,10,11,12,15,15,15,15,15,
 	 4, 6, 7,15, 6, 7, 8,15, 9, 8, 9,15,15,15,15,15,
 	 6, 8, 9,15, 7, 7, 8,15,10, 9,10,15,15,15,15,15,
@@ -152,9 +152,9 @@
 	15,15,15,15,15,15,13,15,15,15,15,15,15,15,15,15,
 };
 
-static static_codebook _huff_book_line_256x7_class1 = {
+static const static_codebook _huff_book_line_256x7_class1 = {
 	1, 256,
-	_huff_lengthlist_line_256x7_class1,
+	(long *)_huff_lengthlist_line_256x7_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -163,7 +163,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_0sub0[] = {
+static const long _huff_lengthlist_line_512x17_0sub0[] = {
 	 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 	 5, 6, 5, 6, 6, 6, 6, 5, 6, 6, 7, 6, 7, 6, 7, 6,
 	 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 9, 7, 9, 7,
@@ -174,9 +174,9 @@
 	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
 };
 
-static static_codebook _huff_book_line_512x17_0sub0 = {
+static const static_codebook _huff_book_line_512x17_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_0sub0,
+	(long *)_huff_lengthlist_line_512x17_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -185,14 +185,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_1sub0[] = {
+static const long _huff_lengthlist_line_512x17_1sub0[] = {
 	 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5,
 	 6, 5, 6, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7,
 };
 
-static static_codebook _huff_book_line_512x17_1sub0 = {
+static const static_codebook _huff_book_line_512x17_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_512x17_1sub0,
+	(long *)_huff_lengthlist_line_512x17_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -201,7 +201,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_1sub1[] = {
+static const long _huff_lengthlist_line_512x17_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 4, 3, 5, 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5,
@@ -212,9 +212,9 @@
 	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
-static static_codebook _huff_book_line_512x17_1sub1 = {
+static const static_codebook _huff_book_line_512x17_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_1sub1,
+	(long *)_huff_lengthlist_line_512x17_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -223,14 +223,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_2sub1[] = {
+static const long _huff_lengthlist_line_512x17_2sub1[] = {
 	 0, 4, 5, 4, 4, 4, 5, 4, 4, 4, 5, 4, 5, 4, 5, 3,
 	 5, 3,
 };
 
-static static_codebook _huff_book_line_512x17_2sub1 = {
+static const static_codebook _huff_book_line_512x17_2sub1 = {
 	1, 18,
-	_huff_lengthlist_line_512x17_2sub1,
+	(long *)_huff_lengthlist_line_512x17_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -239,16 +239,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_2sub2[] = {
+static const long _huff_lengthlist_line_512x17_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 6, 4, 6, 5,
 	 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 7, 8, 7, 9, 7,
 	 9, 8,
 };
 
-static static_codebook _huff_book_line_512x17_2sub2 = {
+static const static_codebook _huff_book_line_512x17_2sub2 = {
 	1, 50,
-	_huff_lengthlist_line_512x17_2sub2,
+	(long *)_huff_lengthlist_line_512x17_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -257,7 +257,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_2sub3[] = {
+static const long _huff_lengthlist_line_512x17_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -268,9 +268,9 @@
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
 };
 
-static static_codebook _huff_book_line_512x17_2sub3 = {
+static const static_codebook _huff_book_line_512x17_2sub3 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_2sub3,
+	(long *)_huff_lengthlist_line_512x17_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -279,14 +279,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_3sub1[] = {
+static const long _huff_lengthlist_line_512x17_3sub1[] = {
 	 0, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 5, 4, 5,
 	 5, 5,
 };
 
-static static_codebook _huff_book_line_512x17_3sub1 = {
+static const static_codebook _huff_book_line_512x17_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_512x17_3sub1,
+	(long *)_huff_lengthlist_line_512x17_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -295,16 +295,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_3sub2[] = {
+static const long _huff_lengthlist_line_512x17_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 2, 3, 3, 4, 3, 5, 4, 6, 4, 6, 5, 7, 6, 7,
 	 6, 8, 6, 8, 7, 9, 8,10, 8,12, 9,13,10,15,10,15,
 	11,14,
 };
 
-static static_codebook _huff_book_line_512x17_3sub2 = {
+static const static_codebook _huff_book_line_512x17_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_512x17_3sub2,
+	(long *)_huff_lengthlist_line_512x17_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -313,7 +313,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_3sub3[] = {
+static const long _huff_lengthlist_line_512x17_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -324,9 +324,9 @@
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_line_512x17_3sub3 = {
+static const static_codebook _huff_book_line_512x17_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_3sub3,
+	(long *)_huff_lengthlist_line_512x17_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -335,13 +335,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_class1[] = {
+static const long _huff_lengthlist_line_512x17_class1[] = {
 	 1, 2, 3, 6, 5, 4, 7, 7,
 };
 
-static static_codebook _huff_book_line_512x17_class1 = {
+static const static_codebook _huff_book_line_512x17_class1 = {
 	1, 8,
-	_huff_lengthlist_line_512x17_class1,
+	(long *)_huff_lengthlist_line_512x17_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -350,16 +350,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_class2[] = {
+static const long _huff_lengthlist_line_512x17_class2[] = {
 	 3, 3, 3,14, 5, 4, 4,11, 8, 6, 6,10,17,12,11,17,
 	 6, 5, 5,15, 5, 3, 4,11, 8, 5, 5, 8,16, 9,10,14,
 	10, 8, 9,17, 8, 6, 6,13,10, 7, 7,10,16,11,13,14,
 	17,17,17,17,17,16,16,16,16,15,16,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_512x17_class2 = {
+static const static_codebook _huff_book_line_512x17_class2 = {
 	1, 64,
-	_huff_lengthlist_line_512x17_class2,
+	(long *)_huff_lengthlist_line_512x17_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -368,16 +368,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_class3[] = {
+static const long _huff_lengthlist_line_512x17_class3[] = {
 	 2, 4, 6,17, 4, 5, 7,17, 8, 7,10,17,17,17,17,17,
 	 3, 4, 6,15, 3, 3, 6,15, 7, 6, 9,17,17,17,17,17,
 	 6, 8,10,17, 6, 6, 8,16, 9, 8,10,17,17,15,16,17,
 	17,17,17,17,12,15,15,16,12,15,15,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_512x17_class3 = {
+static const static_codebook _huff_book_line_512x17_class3 = {
 	1, 64,
-	_huff_lengthlist_line_512x17_class3,
+	(long *)_huff_lengthlist_line_512x17_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -386,7 +386,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_class0[] = {
+static const long _huff_lengthlist_line_128x4_class0[] = {
 	 7, 7, 7,11, 6, 6, 7,11, 7, 6, 6,10,12,10,10,13,
 	 7, 7, 8,11, 7, 7, 7,11, 7, 6, 7,10,11,10,10,13,
 	10,10, 9,12, 9, 9, 9,11, 8, 8, 8,11,13,11,10,14,
@@ -405,9 +405,9 @@
 	17,17,15,17,17,17,17,17,17,13,12,17,17,17,14,17,
 };
 
-static static_codebook _huff_book_line_128x4_class0 = {
+static const static_codebook _huff_book_line_128x4_class0 = {
 	1, 256,
-	_huff_lengthlist_line_128x4_class0,
+	(long *)_huff_lengthlist_line_128x4_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -416,13 +416,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub0[] = {
+static const long _huff_lengthlist_line_128x4_0sub0[] = {
 	 2, 2, 2, 2,
 };
 
-static static_codebook _huff_book_line_128x4_0sub0 = {
+static const static_codebook _huff_book_line_128x4_0sub0 = {
 	1, 4,
-	_huff_lengthlist_line_128x4_0sub0,
+	(long *)_huff_lengthlist_line_128x4_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -431,13 +431,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub1[] = {
+static const long _huff_lengthlist_line_128x4_0sub1[] = {
 	 0, 0, 0, 0, 3, 2, 3, 2, 3, 3,
 };
 
-static static_codebook _huff_book_line_128x4_0sub1 = {
+static const static_codebook _huff_book_line_128x4_0sub1 = {
 	1, 10,
-	_huff_lengthlist_line_128x4_0sub1,
+	(long *)_huff_lengthlist_line_128x4_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -446,14 +446,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub2[] = {
+static const long _huff_lengthlist_line_128x4_0sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 3,
 	 4, 4, 5, 4, 5, 4, 6, 5, 6,
 };
 
-static static_codebook _huff_book_line_128x4_0sub2 = {
+static const static_codebook _huff_book_line_128x4_0sub2 = {
 	1, 25,
-	_huff_lengthlist_line_128x4_0sub2,
+	(long *)_huff_lengthlist_line_128x4_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -462,16 +462,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub3[] = {
+static const long _huff_lengthlist_line_128x4_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3,
 	 5, 4, 6, 5, 6, 5, 7, 6, 6, 7, 7, 9, 9,11,11,16,
 	11,14,10,11,11,13,16,15,15,15,15,15,15,15,15,15,
 };
 
-static static_codebook _huff_book_line_128x4_0sub3 = {
+static const static_codebook _huff_book_line_128x4_0sub3 = {
 	1, 64,
-	_huff_lengthlist_line_128x4_0sub3,
+	(long *)_huff_lengthlist_line_128x4_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -480,7 +480,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_class0[] = {
+static const long _huff_lengthlist_line_256x4_class0[] = {
 	 6, 7, 7,12, 6, 6, 7,12, 7, 6, 6,10,15,12,11,13,
 	 7, 7, 8,13, 7, 7, 8,12, 7, 7, 7,11,12,12,11,13,
 	10, 9, 9,11, 9, 9, 9,10,10, 8, 8,12,14,12,12,14,
@@ -499,9 +499,9 @@
 	15,12,11,15,13,11,11,15,12,14,11,13,15,15,13,13,
 };
 
-static static_codebook _huff_book_line_256x4_class0 = {
+static const static_codebook _huff_book_line_256x4_class0 = {
 	1, 256,
-	_huff_lengthlist_line_256x4_class0,
+	(long *)_huff_lengthlist_line_256x4_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -510,13 +510,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub0[] = {
+static const long _huff_lengthlist_line_256x4_0sub0[] = {
 	 2, 2, 2, 2,
 };
 
-static static_codebook _huff_book_line_256x4_0sub0 = {
+static const static_codebook _huff_book_line_256x4_0sub0 = {
 	1, 4,
-	_huff_lengthlist_line_256x4_0sub0,
+	(long *)_huff_lengthlist_line_256x4_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -525,13 +525,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub1[] = {
+static const long _huff_lengthlist_line_256x4_0sub1[] = {
 	 0, 0, 0, 0, 2, 2, 3, 3, 3, 3,
 };
 
-static static_codebook _huff_book_line_256x4_0sub1 = {
+static const static_codebook _huff_book_line_256x4_0sub1 = {
 	1, 10,
-	_huff_lengthlist_line_256x4_0sub1,
+	(long *)_huff_lengthlist_line_256x4_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -540,14 +540,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub2[] = {
+static const long _huff_lengthlist_line_256x4_0sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 3,
 	 5, 3, 5, 4, 5, 4, 6, 4, 6,
 };
 
-static static_codebook _huff_book_line_256x4_0sub2 = {
+static const static_codebook _huff_book_line_256x4_0sub2 = {
 	1, 25,
-	_huff_lengthlist_line_256x4_0sub2,
+	(long *)_huff_lengthlist_line_256x4_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -556,16 +556,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub3[] = {
+static const long _huff_lengthlist_line_256x4_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3,
 	 6, 4, 7, 4, 7, 5, 7, 6, 7, 6, 7, 8,10,13,13,13,
 	13,13,13,13,13,13,13,13,13,13,13,12,12,12,12,12,
 };
 
-static static_codebook _huff_book_line_256x4_0sub3 = {
+static const static_codebook _huff_book_line_256x4_0sub3 = {
 	1, 64,
-	_huff_lengthlist_line_256x4_0sub3,
+	(long *)_huff_lengthlist_line_256x4_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -574,16 +574,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_class0[] = {
+static const long _huff_lengthlist_line_128x7_class0[] = {
 	10, 7, 8,13, 9, 6, 7,11,10, 8, 8,12,17,17,17,17,
 	 7, 5, 5, 9, 6, 4, 4, 8, 8, 5, 5, 8,16,14,13,16,
 	 7, 5, 5, 7, 6, 3, 3, 5, 8, 5, 4, 7,14,12,12,15,
 	10, 7, 8, 9, 7, 5, 5, 6, 9, 6, 5, 5,15,12, 9,10,
 };
 
-static static_codebook _huff_book_line_128x7_class0 = {
+static const static_codebook _huff_book_line_128x7_class0 = {
 	1, 64,
-	_huff_lengthlist_line_128x7_class0,
+	(long *)_huff_lengthlist_line_128x7_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -592,7 +592,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_class1[] = {
+static const long _huff_lengthlist_line_128x7_class1[] = {
 	 8,13,17,17, 8,11,17,17,11,13,17,17,17,17,17,17,
 	 6,10,16,17, 6,10,15,17, 8,10,16,17,17,17,17,17,
 	 9,13,15,17, 8,11,17,17,10,12,17,17,17,17,17,17,
@@ -611,9 +611,9 @@
 	12,15,17,17,11,14,17,17,11,10,15,17,17,16,17,17,
 };
 
-static static_codebook _huff_book_line_128x7_class1 = {
+static const static_codebook _huff_book_line_128x7_class1 = {
 	1, 256,
-	_huff_lengthlist_line_128x7_class1,
+	(long *)_huff_lengthlist_line_128x7_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -622,13 +622,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_0sub1[] = {
+static const long _huff_lengthlist_line_128x7_0sub1[] = {
 	 0, 3, 3, 3, 3, 3, 3, 3, 3,
 };
 
-static static_codebook _huff_book_line_128x7_0sub1 = {
+static const static_codebook _huff_book_line_128x7_0sub1 = {
 	1, 9,
-	_huff_lengthlist_line_128x7_0sub1,
+	(long *)_huff_lengthlist_line_128x7_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -637,14 +637,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_0sub2[] = {
+static const long _huff_lengthlist_line_128x7_0sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4,
 	 5, 4, 5, 4, 5, 4, 6, 4, 6,
 };
 
-static static_codebook _huff_book_line_128x7_0sub2 = {
+static const static_codebook _huff_book_line_128x7_0sub2 = {
 	1, 25,
-	_huff_lengthlist_line_128x7_0sub2,
+	(long *)_huff_lengthlist_line_128x7_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -653,16 +653,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_0sub3[] = {
+static const long _huff_lengthlist_line_128x7_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 3, 5, 3, 5, 4,
 	 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 	 7, 8, 9,11,13,13,13,13,13,13,13,13,13,13,13,13,
 };
 
-static static_codebook _huff_book_line_128x7_0sub3 = {
+static const static_codebook _huff_book_line_128x7_0sub3 = {
 	1, 64,
-	_huff_lengthlist_line_128x7_0sub3,
+	(long *)_huff_lengthlist_line_128x7_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -671,13 +671,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_1sub1[] = {
+static const long _huff_lengthlist_line_128x7_1sub1[] = {
 	 0, 3, 3, 2, 3, 3, 4, 3, 4,
 };
 
-static static_codebook _huff_book_line_128x7_1sub1 = {
+static const static_codebook _huff_book_line_128x7_1sub1 = {
 	1, 9,
-	_huff_lengthlist_line_128x7_1sub1,
+	(long *)_huff_lengthlist_line_128x7_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -686,14 +686,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_1sub2[] = {
+static const long _huff_lengthlist_line_128x7_1sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 6, 3, 6, 3,
 	 6, 3, 7, 3, 8, 4, 9, 4, 9,
 };
 
-static static_codebook _huff_book_line_128x7_1sub2 = {
+static const static_codebook _huff_book_line_128x7_1sub2 = {
 	1, 25,
-	_huff_lengthlist_line_128x7_1sub2,
+	(long *)_huff_lengthlist_line_128x7_1sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -702,16 +702,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_1sub3[] = {
+static const long _huff_lengthlist_line_128x7_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 7, 2, 7, 3, 8, 4,
 	 9, 5, 9, 8,10,11,11,12,14,14,14,14,14,14,14,14,
 	14,14,14,14,14,14,14,14,14,14,14,14,13,13,13,13,
 };
 
-static static_codebook _huff_book_line_128x7_1sub3 = {
+static const static_codebook _huff_book_line_128x7_1sub3 = {
 	1, 64,
-	_huff_lengthlist_line_128x7_1sub3,
+	(long *)_huff_lengthlist_line_128x7_1sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -720,13 +720,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_class1[] = {
+static const long _huff_lengthlist_line_128x11_class1[] = {
 	 1, 6, 3, 7, 2, 4, 5, 7,
 };
 
-static static_codebook _huff_book_line_128x11_class1 = {
+static const static_codebook _huff_book_line_128x11_class1 = {
 	1, 8,
-	_huff_lengthlist_line_128x11_class1,
+	(long *)_huff_lengthlist_line_128x11_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -735,16 +735,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_class2[] = {
+static const long _huff_lengthlist_line_128x11_class2[] = {
 	 1, 6,12,16, 4,12,15,16, 9,15,16,16,16,16,16,16,
 	 2, 5,11,16, 5,11,13,16, 9,13,16,16,16,16,16,16,
 	 4, 8,12,16, 5, 9,12,16, 9,13,15,16,16,16,16,16,
 	15,16,16,16,11,14,13,16,12,15,16,16,16,16,16,15,
 };
 
-static static_codebook _huff_book_line_128x11_class2 = {
+static const static_codebook _huff_book_line_128x11_class2 = {
 	1, 64,
-	_huff_lengthlist_line_128x11_class2,
+	(long *)_huff_lengthlist_line_128x11_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -753,16 +753,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_class3[] = {
+static const long _huff_lengthlist_line_128x11_class3[] = {
 	 7, 6, 9,17, 7, 6, 8,17,12, 9,11,16,16,16,16,16,
 	 5, 4, 7,16, 5, 3, 6,14, 9, 6, 8,15,16,16,16,16,
 	 5, 4, 6,13, 3, 2, 4,11, 7, 4, 6,13,16,11,10,14,
 	12,12,12,16, 9, 7,10,15,12, 9,11,16,16,15,15,16,
 };
 
-static static_codebook _huff_book_line_128x11_class3 = {
+static const static_codebook _huff_book_line_128x11_class3 = {
 	1, 64,
-	_huff_lengthlist_line_128x11_class3,
+	(long *)_huff_lengthlist_line_128x11_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -771,7 +771,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_0sub0[] = {
+static const long _huff_lengthlist_line_128x11_0sub0[] = {
 	 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 	 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 6,
 	 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, 8, 7,
@@ -782,9 +782,9 @@
 	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
 };
 
-static static_codebook _huff_book_line_128x11_0sub0 = {
+static const static_codebook _huff_book_line_128x11_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_128x11_0sub0,
+	(long *)_huff_lengthlist_line_128x11_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -793,14 +793,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_1sub0[] = {
+static const long _huff_lengthlist_line_128x11_1sub0[] = {
 	 2, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5,
 	 6, 5, 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6,
 };
 
-static static_codebook _huff_book_line_128x11_1sub0 = {
+static const static_codebook _huff_book_line_128x11_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_128x11_1sub0,
+	(long *)_huff_lengthlist_line_128x11_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -809,7 +809,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_1sub1[] = {
+static const long _huff_lengthlist_line_128x11_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 5, 3, 5, 3, 6, 4, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4,
@@ -820,9 +820,9 @@
 	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
 };
 
-static static_codebook _huff_book_line_128x11_1sub1 = {
+static const static_codebook _huff_book_line_128x11_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_128x11_1sub1,
+	(long *)_huff_lengthlist_line_128x11_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -831,14 +831,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_2sub1[] = {
+static const long _huff_lengthlist_line_128x11_2sub1[] = {
 	 0, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4,
 	 5, 5,
 };
 
-static static_codebook _huff_book_line_128x11_2sub1 = {
+static const static_codebook _huff_book_line_128x11_2sub1 = {
 	1, 18,
-	_huff_lengthlist_line_128x11_2sub1,
+	(long *)_huff_lengthlist_line_128x11_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -847,16 +847,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_2sub2[] = {
+static const long _huff_lengthlist_line_128x11_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 6, 5, 7,
 	 5, 7, 6, 8, 6, 8, 6, 9, 7, 9, 7,10, 7, 9, 8,11,
 	 8,11,
 };
 
-static static_codebook _huff_book_line_128x11_2sub2 = {
+static const static_codebook _huff_book_line_128x11_2sub2 = {
 	1, 50,
-	_huff_lengthlist_line_128x11_2sub2,
+	(long *)_huff_lengthlist_line_128x11_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -865,7 +865,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_2sub3[] = {
+static const long _huff_lengthlist_line_128x11_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -876,9 +876,9 @@
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_line_128x11_2sub3 = {
+static const static_codebook _huff_book_line_128x11_2sub3 = {
 	1, 128,
-	_huff_lengthlist_line_128x11_2sub3,
+	(long *)_huff_lengthlist_line_128x11_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -887,14 +887,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_3sub1[] = {
+static const long _huff_lengthlist_line_128x11_3sub1[] = {
 	 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4,
 	 5, 4,
 };
 
-static static_codebook _huff_book_line_128x11_3sub1 = {
+static const static_codebook _huff_book_line_128x11_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_128x11_3sub1,
+	(long *)_huff_lengthlist_line_128x11_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -903,16 +903,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_3sub2[] = {
+static const long _huff_lengthlist_line_128x11_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 5, 3, 5, 4, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4,
 	 8, 4, 9, 4, 9, 4,10, 4,10, 5,10, 5,11, 5,12, 6,
 	12, 6,
 };
 
-static static_codebook _huff_book_line_128x11_3sub2 = {
+static const static_codebook _huff_book_line_128x11_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_128x11_3sub2,
+	(long *)_huff_lengthlist_line_128x11_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -921,7 +921,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_3sub3[] = {
+static const long _huff_lengthlist_line_128x11_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -932,9 +932,9 @@
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9,
 };
 
-static static_codebook _huff_book_line_128x11_3sub3 = {
+static const static_codebook _huff_book_line_128x11_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_128x11_3sub3,
+	(long *)_huff_lengthlist_line_128x11_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -943,13 +943,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_class1[] = {
+static const long _huff_lengthlist_line_128x17_class1[] = {
 	 1, 3, 4, 7, 2, 5, 6, 7,
 };
 
-static static_codebook _huff_book_line_128x17_class1 = {
+static const static_codebook _huff_book_line_128x17_class1 = {
 	1, 8,
-	_huff_lengthlist_line_128x17_class1,
+	(long *)_huff_lengthlist_line_128x17_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -958,16 +958,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_class2[] = {
+static const long _huff_lengthlist_line_128x17_class2[] = {
 	 1, 4,10,19, 3, 8,13,19, 7,12,19,19,19,19,19,19,
 	 2, 6,11,19, 8,13,19,19, 9,11,19,19,19,19,19,19,
 	 6, 7,13,19, 9,13,19,19,10,13,18,18,18,18,18,18,
 	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
 };
 
-static static_codebook _huff_book_line_128x17_class2 = {
+static const static_codebook _huff_book_line_128x17_class2 = {
 	1, 64,
-	_huff_lengthlist_line_128x17_class2,
+	(long *)_huff_lengthlist_line_128x17_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -976,16 +976,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_class3[] = {
+static const long _huff_lengthlist_line_128x17_class3[] = {
 	 3, 6,10,17, 4, 8,11,20, 8,10,11,20,20,20,20,20,
 	 2, 4, 8,18, 4, 6, 8,17, 7, 8,10,20,20,17,20,20,
 	 3, 5, 8,17, 3, 4, 6,17, 8, 8,10,17,17,12,16,20,
 	13,13,15,20,10,10,12,20,15,14,15,20,20,20,19,19,
 };
 
-static static_codebook _huff_book_line_128x17_class3 = {
+static const static_codebook _huff_book_line_128x17_class3 = {
 	1, 64,
-	_huff_lengthlist_line_128x17_class3,
+	(long *)_huff_lengthlist_line_128x17_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -994,7 +994,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_0sub0[] = {
+static const long _huff_lengthlist_line_128x17_0sub0[] = {
 	 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 	 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5,
 	 8, 5, 8, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, 9, 6,
@@ -1005,9 +1005,9 @@
 	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
 };
 
-static static_codebook _huff_book_line_128x17_0sub0 = {
+static const static_codebook _huff_book_line_128x17_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_0sub0,
+	(long *)_huff_lengthlist_line_128x17_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1016,14 +1016,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_1sub0[] = {
+static const long _huff_lengthlist_line_128x17_1sub0[] = {
 	 2, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5,
 	 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7,
 };
 
-static static_codebook _huff_book_line_128x17_1sub0 = {
+static const static_codebook _huff_book_line_128x17_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_128x17_1sub0,
+	(long *)_huff_lengthlist_line_128x17_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1032,7 +1032,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_1sub1[] = {
+static const long _huff_lengthlist_line_128x17_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 4, 3, 5, 3, 5, 3, 6, 3, 6, 4, 6, 4, 7, 4, 7, 5,
@@ -1043,9 +1043,9 @@
 	17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_128x17_1sub1 = {
+static const static_codebook _huff_book_line_128x17_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_1sub1,
+	(long *)_huff_lengthlist_line_128x17_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1054,14 +1054,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_2sub1[] = {
+static const long _huff_lengthlist_line_128x17_2sub1[] = {
 	 0, 4, 5, 4, 6, 4, 8, 3, 9, 3, 9, 2, 9, 3, 8, 4,
 	 9, 4,
 };
 
-static static_codebook _huff_book_line_128x17_2sub1 = {
+static const static_codebook _huff_book_line_128x17_2sub1 = {
 	1, 18,
-	_huff_lengthlist_line_128x17_2sub1,
+	(long *)_huff_lengthlist_line_128x17_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1070,16 +1070,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_2sub2[] = {
+static const long _huff_lengthlist_line_128x17_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 5, 1, 5, 3, 5, 3, 5, 4, 7, 5,10, 7,10, 7,
 	12,10,14,10,14, 9,14,11,14,14,14,13,13,13,13,13,
 	13,13,
 };
 
-static static_codebook _huff_book_line_128x17_2sub2 = {
+static const static_codebook _huff_book_line_128x17_2sub2 = {
 	1, 50,
-	_huff_lengthlist_line_128x17_2sub2,
+	(long *)_huff_lengthlist_line_128x17_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1088,7 +1088,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_2sub3[] = {
+static const long _huff_lengthlist_line_128x17_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1099,9 +1099,9 @@
 	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
 
-static static_codebook _huff_book_line_128x17_2sub3 = {
+static const static_codebook _huff_book_line_128x17_2sub3 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_2sub3,
+	(long *)_huff_lengthlist_line_128x17_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1110,14 +1110,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_3sub1[] = {
+static const long _huff_lengthlist_line_128x17_3sub1[] = {
 	 0, 4, 4, 4, 4, 4, 4, 4, 5, 3, 5, 3, 5, 4, 6, 4,
 	 6, 4,
 };
 
-static static_codebook _huff_book_line_128x17_3sub1 = {
+static const static_codebook _huff_book_line_128x17_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_128x17_3sub1,
+	(long *)_huff_lengthlist_line_128x17_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1126,16 +1126,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_3sub2[] = {
+static const long _huff_lengthlist_line_128x17_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 5, 3, 6, 3, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4,
 	 8, 4, 8, 4, 8, 4, 9, 4, 9, 5,10, 5,10, 7,10, 8,
 	10, 8,
 };
 
-static static_codebook _huff_book_line_128x17_3sub2 = {
+static const static_codebook _huff_book_line_128x17_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_128x17_3sub2,
+	(long *)_huff_lengthlist_line_128x17_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1144,7 +1144,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_3sub3[] = {
+static const long _huff_lengthlist_line_128x17_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1155,9 +1155,9 @@
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 };
 
-static static_codebook _huff_book_line_128x17_3sub3 = {
+static const static_codebook _huff_book_line_128x17_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_3sub3,
+	(long *)_huff_lengthlist_line_128x17_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1166,13 +1166,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class1[] = {
+static const long _huff_lengthlist_line_1024x27_class1[] = {
 	 2,10, 8,14, 7,12,11,14, 1, 5, 3, 7, 4, 9, 7,13,
 };
 
-static static_codebook _huff_book_line_1024x27_class1 = {
+static const static_codebook _huff_book_line_1024x27_class1 = {
 	1, 16,
-	_huff_lengthlist_line_1024x27_class1,
+	(long *)_huff_lengthlist_line_1024x27_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1181,13 +1181,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class2[] = {
+static const long _huff_lengthlist_line_1024x27_class2[] = {
 	 1, 4, 2, 6, 3, 7, 5, 7,
 };
 
-static static_codebook _huff_book_line_1024x27_class2 = {
+static const static_codebook _huff_book_line_1024x27_class2 = {
 	1, 8,
-	_huff_lengthlist_line_1024x27_class2,
+	(long *)_huff_lengthlist_line_1024x27_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1196,7 +1196,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class3[] = {
+static const long _huff_lengthlist_line_1024x27_class3[] = {
 	 1, 5, 7,21, 5, 8, 9,21,10, 9,12,20,20,16,20,20,
 	 4, 8, 9,20, 6, 8, 9,20,11,11,13,20,20,15,17,20,
 	 9,11,14,20, 8,10,15,20,11,13,15,20,20,20,20,20,
@@ -1215,9 +1215,9 @@
 	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
 };
 
-static static_codebook _huff_book_line_1024x27_class3 = {
+static const static_codebook _huff_book_line_1024x27_class3 = {
 	1, 256,
-	_huff_lengthlist_line_1024x27_class3,
+	(long *)_huff_lengthlist_line_1024x27_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1226,16 +1226,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class4[] = {
+static const long _huff_lengthlist_line_1024x27_class4[] = {
 	 2, 3, 7,13, 4, 4, 7,15, 8, 6, 9,17,21,16,15,21,
 	 2, 5, 7,11, 5, 5, 7,14, 9, 7,10,16,17,15,16,21,
 	 4, 7,10,17, 7, 7, 9,15,11, 9,11,16,21,18,15,21,
 	18,21,21,21,15,17,17,19,21,19,18,20,21,21,21,20,
 };
 
-static static_codebook _huff_book_line_1024x27_class4 = {
+static const static_codebook _huff_book_line_1024x27_class4 = {
 	1, 64,
-	_huff_lengthlist_line_1024x27_class4,
+	(long *)_huff_lengthlist_line_1024x27_class4,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1244,7 +1244,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_0sub0[] = {
+static const long _huff_lengthlist_line_1024x27_0sub0[] = {
 	 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 	 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5,
 	 8, 6, 8, 6, 8, 6, 9, 6, 9, 6,10, 6,10, 6,11, 6,
@@ -1255,9 +1255,9 @@
 	22,22,22,22,22,22,21,21,21,21,21,21,21,21,21,21,
 };
 
-static static_codebook _huff_book_line_1024x27_0sub0 = {
+static const static_codebook _huff_book_line_1024x27_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_0sub0,
+	(long *)_huff_lengthlist_line_1024x27_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1266,14 +1266,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_1sub0[] = {
+static const long _huff_lengthlist_line_1024x27_1sub0[] = {
 	 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5, 6, 5,
 	 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6,
 };
 
-static static_codebook _huff_book_line_1024x27_1sub0 = {
+static const static_codebook _huff_book_line_1024x27_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_1024x27_1sub0,
+	(long *)_huff_lengthlist_line_1024x27_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1282,7 +1282,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_1sub1[] = {
+static const long _huff_lengthlist_line_1024x27_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 8, 5, 8, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4,
@@ -1293,9 +1293,9 @@
 	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
 };
 
-static static_codebook _huff_book_line_1024x27_1sub1 = {
+static const static_codebook _huff_book_line_1024x27_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_1sub1,
+	(long *)_huff_lengthlist_line_1024x27_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1304,14 +1304,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_2sub0[] = {
+static const long _huff_lengthlist_line_1024x27_2sub0[] = {
 	 1, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 	 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8,10, 9,10, 9,
 };
 
-static static_codebook _huff_book_line_1024x27_2sub0 = {
+static const static_codebook _huff_book_line_1024x27_2sub0 = {
 	1, 32,
-	_huff_lengthlist_line_1024x27_2sub0,
+	(long *)_huff_lengthlist_line_1024x27_2sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1320,7 +1320,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_2sub1[] = {
+static const long _huff_lengthlist_line_1024x27_2sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, 6, 5,
@@ -1331,9 +1331,9 @@
 	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,15,
 };
 
-static static_codebook _huff_book_line_1024x27_2sub1 = {
+static const static_codebook _huff_book_line_1024x27_2sub1 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_2sub1,
+	(long *)_huff_lengthlist_line_1024x27_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1342,14 +1342,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_3sub1[] = {
+static const long _huff_lengthlist_line_1024x27_3sub1[] = {
 	 0, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 4, 5,
 	 5, 5,
 };
 
-static static_codebook _huff_book_line_1024x27_3sub1 = {
+static const static_codebook _huff_book_line_1024x27_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_1024x27_3sub1,
+	(long *)_huff_lengthlist_line_1024x27_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1358,16 +1358,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_3sub2[] = {
+static const long _huff_lengthlist_line_1024x27_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6,
 	 5, 7, 5, 8, 6, 8, 6, 9, 7,10, 7,10, 8,10, 8,11,
 	 9,11,
 };
 
-static static_codebook _huff_book_line_1024x27_3sub2 = {
+static const static_codebook _huff_book_line_1024x27_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_1024x27_3sub2,
+	(long *)_huff_lengthlist_line_1024x27_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1376,7 +1376,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_3sub3[] = {
+static const long _huff_lengthlist_line_1024x27_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1387,9 +1387,9 @@
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
-static static_codebook _huff_book_line_1024x27_3sub3 = {
+static const static_codebook _huff_book_line_1024x27_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_3sub3,
+	(long *)_huff_lengthlist_line_1024x27_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1398,14 +1398,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_4sub1[] = {
+static const long _huff_lengthlist_line_1024x27_4sub1[] = {
 	 0, 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4,
 	 5, 4,
 };
 
-static static_codebook _huff_book_line_1024x27_4sub1 = {
+static const static_codebook _huff_book_line_1024x27_4sub1 = {
 	1, 18,
-	_huff_lengthlist_line_1024x27_4sub1,
+	(long *)_huff_lengthlist_line_1024x27_4sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1414,16 +1414,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_4sub2[] = {
+static const long _huff_lengthlist_line_1024x27_4sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 4, 2, 4, 2, 5, 3, 5, 4, 6, 6, 6, 7, 7, 8,
 	 7, 8, 7, 8, 7, 9, 8, 9, 8, 9, 8,10, 8,11, 9,12,
 	 9,12,
 };
 
-static static_codebook _huff_book_line_1024x27_4sub2 = {
+static const static_codebook _huff_book_line_1024x27_4sub2 = {
 	1, 50,
-	_huff_lengthlist_line_1024x27_4sub2,
+	(long *)_huff_lengthlist_line_1024x27_4sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1432,7 +1432,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_4sub3[] = {
+static const long _huff_lengthlist_line_1024x27_4sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1443,9 +1443,9 @@
 	11,11,11,11,11,11,11,11,11,11,10,10,10,10,10,10,
 };
 
-static static_codebook _huff_book_line_1024x27_4sub3 = {
+static const static_codebook _huff_book_line_1024x27_4sub3 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_4sub3,
+	(long *)_huff_lengthlist_line_1024x27_4sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1454,13 +1454,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_class1[] = {
+static const long _huff_lengthlist_line_2048x27_class1[] = {
 	 2, 6, 8, 9, 7,11,13,13, 1, 3, 5, 5, 6, 6,12,10,
 };
 
-static static_codebook _huff_book_line_2048x27_class1 = {
+static const static_codebook _huff_book_line_2048x27_class1 = {
 	1, 16,
-	_huff_lengthlist_line_2048x27_class1,
+	(long *)_huff_lengthlist_line_2048x27_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1469,13 +1469,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_class2[] = {
+static const long _huff_lengthlist_line_2048x27_class2[] = {
 	 1, 2, 3, 6, 4, 7, 5, 7,
 };
 
-static static_codebook _huff_book_line_2048x27_class2 = {
+static const static_codebook _huff_book_line_2048x27_class2 = {
 	1, 8,
-	_huff_lengthlist_line_2048x27_class2,
+	(long *)_huff_lengthlist_line_2048x27_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1484,7 +1484,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_class3[] = {
+static const long _huff_lengthlist_line_2048x27_class3[] = {
 	 3, 3, 6,16, 5, 5, 7,16, 9, 8,11,16,16,16,16,16,
 	 5, 5, 8,16, 5, 5, 7,16, 8, 7, 9,16,16,16,16,16,
 	 9, 9,12,16, 6, 8,11,16, 9,10,11,16,16,16,16,16,
@@ -1503,9 +1503,9 @@
 	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_2048x27_class3 = {
+static const static_codebook _huff_book_line_2048x27_class3 = {
 	1, 256,
-	_huff_lengthlist_line_2048x27_class3,
+	(long *)_huff_lengthlist_line_2048x27_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1514,16 +1514,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_class4[] = {
+static const long _huff_lengthlist_line_2048x27_class4[] = {
 	 2, 4, 7,13, 4, 5, 7,15, 8, 7,10,16,16,14,16,16,
 	 2, 4, 7,16, 3, 4, 7,14, 8, 8,10,16,16,16,15,16,
 	 6, 8,11,16, 7, 7, 9,16,11, 9,13,16,16,16,15,16,
 	16,16,16,16,14,16,16,16,16,16,16,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_2048x27_class4 = {
+static const static_codebook _huff_book_line_2048x27_class4 = {
 	1, 64,
-	_huff_lengthlist_line_2048x27_class4,
+	(long *)_huff_lengthlist_line_2048x27_class4,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1532,7 +1532,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_0sub0[] = {
+static const long _huff_lengthlist_line_2048x27_0sub0[] = {
 	 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 	 6, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, 8, 5, 9, 5,
 	 9, 6,10, 6,10, 6,11, 6,11, 6,11, 6,11, 6,11, 6,
@@ -1543,9 +1543,9 @@
 	17,17,17,17,17,17,17,17,17,17,17,17,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_2048x27_0sub0 = {
+static const static_codebook _huff_book_line_2048x27_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_2048x27_0sub0,
+	(long *)_huff_lengthlist_line_2048x27_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1554,14 +1554,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_1sub0[] = {
+static const long _huff_lengthlist_line_2048x27_1sub0[] = {
 	 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
 	 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6,
 };
 
-static static_codebook _huff_book_line_2048x27_1sub0 = {
+static const static_codebook _huff_book_line_2048x27_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_2048x27_1sub0,
+	(long *)_huff_lengthlist_line_2048x27_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1570,7 +1570,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_1sub1[] = {
+static const long _huff_lengthlist_line_2048x27_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 6, 5, 7, 5, 7, 4, 7, 4, 8, 4, 8, 4, 8, 4, 8, 3,
@@ -1581,9 +1581,9 @@
 	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,14,
 };
 
-static static_codebook _huff_book_line_2048x27_1sub1 = {
+static const static_codebook _huff_book_line_2048x27_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_2048x27_1sub1,
+	(long *)_huff_lengthlist_line_2048x27_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1592,14 +1592,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_2sub0[] = {
+static const long _huff_lengthlist_line_2048x27_2sub0[] = {
 	 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5,
 	 6, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
 };
 
-static static_codebook _huff_book_line_2048x27_2sub0 = {
+static const static_codebook _huff_book_line_2048x27_2sub0 = {
 	1, 32,
-	_huff_lengthlist_line_2048x27_2sub0,
+	(long *)_huff_lengthlist_line_2048x27_2sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1608,7 +1608,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_2sub1[] = {
+static const long _huff_lengthlist_line_2048x27_2sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 6, 6, 6, 7,
@@ -1619,9 +1619,9 @@
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
-static static_codebook _huff_book_line_2048x27_2sub1 = {
+static const static_codebook _huff_book_line_2048x27_2sub1 = {
 	1, 128,
-	_huff_lengthlist_line_2048x27_2sub1,
+	(long *)_huff_lengthlist_line_2048x27_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1630,14 +1630,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_3sub1[] = {
+static const long _huff_lengthlist_line_2048x27_3sub1[] = {
 	 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
 	 5, 5,
 };
 
-static static_codebook _huff_book_line_2048x27_3sub1 = {
+static const static_codebook _huff_book_line_2048x27_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_2048x27_3sub1,
+	(long *)_huff_lengthlist_line_2048x27_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1646,16 +1646,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_3sub2[] = {
+static const long _huff_lengthlist_line_2048x27_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6,
 	 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, 9, 9,11, 9,12,
 	10,12,
 };
 
-static static_codebook _huff_book_line_2048x27_3sub2 = {
+static const static_codebook _huff_book_line_2048x27_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_2048x27_3sub2,
+	(long *)_huff_lengthlist_line_2048x27_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1664,7 +1664,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_3sub3[] = {
+static const long _huff_lengthlist_line_2048x27_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1675,9 +1675,9 @@
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_line_2048x27_3sub3 = {
+static const static_codebook _huff_book_line_2048x27_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_2048x27_3sub3,
+	(long *)_huff_lengthlist_line_2048x27_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1686,14 +1686,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_4sub1[] = {
+static const long _huff_lengthlist_line_2048x27_4sub1[] = {
 	 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4,
 	 4, 5,
 };
 
-static static_codebook _huff_book_line_2048x27_4sub1 = {
+static const static_codebook _huff_book_line_2048x27_4sub1 = {
 	1, 18,
-	_huff_lengthlist_line_2048x27_4sub1,
+	(long *)_huff_lengthlist_line_2048x27_4sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1702,16 +1702,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_4sub2[] = {
+static const long _huff_lengthlist_line_2048x27_4sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 3, 2, 4, 3, 4, 4, 4, 5, 5, 6, 5, 6, 5, 7,
 	 6, 6, 6, 7, 7, 7, 8, 9, 9, 9,12,10,11,10,10,12,
 	10,10,
 };
 
-static static_codebook _huff_book_line_2048x27_4sub2 = {
+static const static_codebook _huff_book_line_2048x27_4sub2 = {
 	1, 50,
-	_huff_lengthlist_line_2048x27_4sub2,
+	(long *)_huff_lengthlist_line_2048x27_4sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1720,7 +1720,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_2048x27_4sub3[] = {
+static const long _huff_lengthlist_line_2048x27_4sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1731,9 +1731,9 @@
 	 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
 
-static static_codebook _huff_book_line_2048x27_4sub3 = {
+static const static_codebook _huff_book_line_2048x27_4sub3 = {
 	1, 128,
-	_huff_lengthlist_line_2048x27_4sub3,
+	(long *)_huff_lengthlist_line_2048x27_4sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1742,7 +1742,7 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4low_class0[] = {
+static const long _huff_lengthlist_line_256x4low_class0[] = {
 	 4, 5, 6,11, 5, 5, 6,10, 7, 7, 6, 6,14,13, 9, 9,
 	 6, 6, 6,10, 6, 6, 6, 9, 8, 7, 7, 9,14,12, 8,11,
 	 8, 7, 7,11, 8, 8, 7,11, 9, 9, 7, 9,13,11, 9,13,
@@ -1761,9 +1761,9 @@
 	18,18,18,18,18,18,18,18,18,12,13,18,16,11, 9,18,
 };
 
-static static_codebook _huff_book_line_256x4low_class0 = {
+static const static_codebook _huff_book_line_256x4low_class0 = {
 	1, 256,
-	_huff_lengthlist_line_256x4low_class0,
+	(long *)_huff_lengthlist_line_256x4low_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1772,13 +1772,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4low_0sub0[] = {
+static const long _huff_lengthlist_line_256x4low_0sub0[] = {
 	 1, 3, 2, 3,
 };
 
-static static_codebook _huff_book_line_256x4low_0sub0 = {
+static const static_codebook _huff_book_line_256x4low_0sub0 = {
 	1, 4,
-	_huff_lengthlist_line_256x4low_0sub0,
+	(long *)_huff_lengthlist_line_256x4low_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1787,13 +1787,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4low_0sub1[] = {
+static const long _huff_lengthlist_line_256x4low_0sub1[] = {
 	 0, 0, 0, 0, 2, 3, 2, 3, 3, 3,
 };
 
-static static_codebook _huff_book_line_256x4low_0sub1 = {
+static const static_codebook _huff_book_line_256x4low_0sub1 = {
 	1, 10,
-	_huff_lengthlist_line_256x4low_0sub1,
+	(long *)_huff_lengthlist_line_256x4low_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1802,14 +1802,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4low_0sub2[] = {
+static const long _huff_lengthlist_line_256x4low_0sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4,
 	 4, 4, 4, 4, 5, 5, 5, 6, 6,
 };
 
-static static_codebook _huff_book_line_256x4low_0sub2 = {
+static const static_codebook _huff_book_line_256x4low_0sub2 = {
 	1, 25,
-	_huff_lengthlist_line_256x4low_0sub2,
+	(long *)_huff_lengthlist_line_256x4low_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1818,16 +1818,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4low_0sub3[] = {
+static const long _huff_lengthlist_line_256x4low_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 2, 4, 3, 5, 4,
 	 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 6, 9,
 	 7,12,11,16,13,16,12,15,13,15,12,14,12,15,15,15,
 };
 
-static static_codebook _huff_book_line_256x4low_0sub3 = {
+static const static_codebook _huff_book_line_256x4low_0sub3 = {
 	1, 64,
-	_huff_lengthlist_line_256x4low_0sub3,
+	(long *)_huff_lengthlist_line_256x4low_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,

Modified: trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h
===================================================================
--- trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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,39 +31,39 @@
 	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 = {
-	_vq_quantthresh__16u0__p1_0,
-	_vq_quantmap__16u0__p1_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p1_0 = {
+	(float *)_vq_quantthresh__16u0__p1_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16u0__p1_0,
+	(long *)_vq_quantlist__16u0__p1_0,
 	NULL,
-	&_vq_auxt__16u0__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p1_0,
 	NULL,
 	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,33 +72,33 @@
 	 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 = {
-	_vq_quantthresh__16u0__p2_0,
-	_vq_quantmap__16u0__p2_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p2_0 = {
+	(float *)_vq_quantthresh__16u0__p2_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16u0__p2_0,
+	(long *)_vq_quantlist__16u0__p2_0,
 	NULL,
-	&_vq_auxt__16u0__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p3_0[] = {
+static const long _vq_quantlist__16u0__p3_0[] = {
 	2,
 	1,
 	3,
@@ -106,7 +106,7 @@
 	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,33 +149,33 @@
 	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 = {
-	_vq_quantthresh__16u0__p3_0,
-	_vq_quantmap__16u0__p3_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p3_0 = {
+	(float *)_vq_quantthresh__16u0__p3_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u0__p3_0,
+	(long *)_vq_quantlist__16u0__p3_0,
 	NULL,
-	&_vq_auxt__16u0__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p4_0[] = {
+static const long _vq_quantlist__16u0__p4_0[] = {
 	2,
 	1,
 	3,
@@ -183,7 +183,7 @@
 	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,33 +226,33 @@
 	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 = {
-	_vq_quantthresh__16u0__p4_0,
-	_vq_quantmap__16u0__p4_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p4_0 = {
+	(float *)_vq_quantthresh__16u0__p4_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u0__p4_0,
+	(long *)_vq_quantlist__16u0__p4_0,
 	NULL,
-	&_vq_auxt__16u0__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p5_0[] = {
+static const long _vq_quantlist__16u0__p5_0[] = {
 	4,
 	3,
 	5,
@@ -264,7 +264,7 @@
 	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,34 +273,34 @@
 	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 = {
-	_vq_quantthresh__16u0__p5_0,
-	_vq_quantmap__16u0__p5_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p5_0 = {
+	(float *)_vq_quantthresh__16u0__p5_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16u0__p5_0,
+	(long *)_vq_quantlist__16u0__p5_0,
 	NULL,
-	&_vq_auxt__16u0__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p6_0[] = {
+static const long _vq_quantlist__16u0__p6_0[] = {
 	6,
 	5,
 	7,
@@ -316,7 +316,7 @@
 	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,35 +330,35 @@
 	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 = {
-	_vq_quantthresh__16u0__p6_0,
-	_vq_quantmap__16u0__p6_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p6_0 = {
+	(float *)_vq_quantthresh__16u0__p6_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__16u0__p6_0,
+	(long *)_vq_quantlist__16u0__p6_0,
 	NULL,
-	&_vq_auxt__16u0__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p6_1[] = {
+static const long _vq_quantlist__16u0__p6_1[] = {
 	2,
 	1,
 	3,
@@ -366,44 +366,44 @@
 	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 = {
-	_vq_quantthresh__16u0__p6_1,
-	_vq_quantmap__16u0__p6_1,
+static const encode_aux_threshmatch _vq_auxt__16u0__p6_1 = {
+	(float *)_vq_quantthresh__16u0__p6_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u0__p6_1,
+	(long *)_vq_quantlist__16u0__p6_1,
 	NULL,
-	&_vq_auxt__16u0__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p6_1,
 	NULL,
 	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,33 +412,33 @@
 	 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 = {
-	_vq_quantthresh__16u0__p7_0,
-	_vq_quantmap__16u0__p7_0,
+static const encode_aux_threshmatch _vq_auxt__16u0__p7_0 = {
+	(float *)_vq_quantthresh__16u0__p7_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p7_0,
 	1, -518803456, 1628680192, 2, 0,
-	_vq_quantlist__16u0__p7_0,
+	(long *)_vq_quantlist__16u0__p7_0,
 	NULL,
-	&_vq_auxt__16u0__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p7_1[] = {
+static const long _vq_quantlist__16u0__p7_1[] = {
 	7,
 	6,
 	8,
@@ -456,7 +456,7 @@
 	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,35 +474,35 @@
 	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 = {
-	_vq_quantthresh__16u0__p7_1,
-	_vq_quantmap__16u0__p7_1,
+static const encode_aux_threshmatch _vq_auxt__16u0__p7_1 = {
+	(float *)_vq_quantthresh__16u0__p7_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p7_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__16u0__p7_1,
+	(long *)_vq_quantlist__16u0__p7_1,
 	NULL,
-	&_vq_auxt__16u0__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u0__p7_2[] = {
+static const long _vq_quantlist__16u0__p7_2[] = {
 	10,
 	9,
 	11,
@@ -526,7 +526,7 @@
 	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,46 +557,46 @@
 	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 = {
-	_vq_quantthresh__16u0__p7_2,
-	_vq_quantmap__16u0__p7_2,
+static const encode_aux_threshmatch _vq_auxt__16u0__p7_2 = {
+	(float *)_vq_quantthresh__16u0__p7_2,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u0__p7_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__16u0__p7_2,
+	(long *)_vq_quantlist__16u0__p7_2,
 	NULL,
-	&_vq_auxt__16u0__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__16u0__p7_2,
 	NULL,
 	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,
+	(long *)_huff_lengthlist__16u0__single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -605,7 +605,7 @@
 	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,9 +615,9 @@
 	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,
+	(long *)_huff_lengthlist__16u1__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -626,13 +626,13 @@
 	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,39 +641,39 @@
 	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 = {
-	_vq_quantthresh__16u1__p1_0,
-	_vq_quantmap__16u1__p1_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p1_0 = {
+	(float *)_vq_quantthresh__16u1__p1_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16u1__p1_0,
+	(long *)_vq_quantlist__16u1__p1_0,
 	NULL,
-	&_vq_auxt__16u1__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p1_0,
 	NULL,
 	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,33 +682,33 @@
 	 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 = {
-	_vq_quantthresh__16u1__p2_0,
-	_vq_quantmap__16u1__p2_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p2_0 = {
+	(float *)_vq_quantthresh__16u1__p2_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16u1__p2_0,
+	(long *)_vq_quantlist__16u1__p2_0,
 	NULL,
-	&_vq_auxt__16u1__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p3_0[] = {
+static const long _vq_quantlist__16u1__p3_0[] = {
 	2,
 	1,
 	3,
@@ -716,7 +716,7 @@
 	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,33 +759,33 @@
 	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 = {
-	_vq_quantthresh__16u1__p3_0,
-	_vq_quantmap__16u1__p3_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p3_0 = {
+	(float *)_vq_quantthresh__16u1__p3_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u1__p3_0,
+	(long *)_vq_quantlist__16u1__p3_0,
 	NULL,
-	&_vq_auxt__16u1__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p4_0[] = {
+static const long _vq_quantlist__16u1__p4_0[] = {
 	2,
 	1,
 	3,
@@ -793,7 +793,7 @@
 	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,33 +836,33 @@
 	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 = {
-	_vq_quantthresh__16u1__p4_0,
-	_vq_quantmap__16u1__p4_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p4_0 = {
+	(float *)_vq_quantthresh__16u1__p4_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u1__p4_0,
+	(long *)_vq_quantlist__16u1__p4_0,
 	NULL,
-	&_vq_auxt__16u1__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p5_0[] = {
+static const long _vq_quantlist__16u1__p5_0[] = {
 	4,
 	3,
 	5,
@@ -874,7 +874,7 @@
 	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,34 +883,34 @@
 	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 = {
-	_vq_quantthresh__16u1__p5_0,
-	_vq_quantmap__16u1__p5_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p5_0 = {
+	(float *)_vq_quantthresh__16u1__p5_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16u1__p5_0,
+	(long *)_vq_quantlist__16u1__p5_0,
 	NULL,
-	&_vq_auxt__16u1__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p6_0[] = {
+static const long _vq_quantlist__16u1__p6_0[] = {
 	4,
 	3,
 	5,
@@ -922,7 +922,7 @@
 	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,40 +931,40 @@
 	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 = {
-	_vq_quantthresh__16u1__p6_0,
-	_vq_quantmap__16u1__p6_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p6_0 = {
+	(float *)_vq_quantthresh__16u1__p6_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p6_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16u1__p6_0,
+	(long *)_vq_quantlist__16u1__p6_0,
 	NULL,
-	&_vq_auxt__16u1__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p6_0,
 	NULL,
 	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,33 +973,33 @@
 	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 = {
-	_vq_quantthresh__16u1__p7_0,
-	_vq_quantmap__16u1__p7_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p7_0 = {
+	(float *)_vq_quantthresh__16u1__p7_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__16u1__p7_0,
+	(long *)_vq_quantlist__16u1__p7_0,
 	NULL,
-	&_vq_auxt__16u1__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p7_1[] = {
+static const long _vq_quantlist__16u1__p7_1[] = {
 	5,
 	4,
 	6,
@@ -1013,7 +1013,7 @@
 	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,35 +1024,35 @@
 	 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 = {
-	_vq_quantthresh__16u1__p7_1,
-	_vq_quantmap__16u1__p7_1,
+static const encode_aux_threshmatch _vq_auxt__16u1__p7_1 = {
+	(float *)_vq_quantthresh__16u1__p7_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16u1__p7_1,
+	(long *)_vq_quantlist__16u1__p7_1,
 	NULL,
-	&_vq_auxt__16u1__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p8_0[] = {
+static const long _vq_quantlist__16u1__p8_0[] = {
 	5,
 	4,
 	6,
@@ -1066,7 +1066,7 @@
 	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,35 +1077,35 @@
 	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 = {
-	_vq_quantthresh__16u1__p8_0,
-	_vq_quantmap__16u1__p8_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p8_0 = {
+	(float *)_vq_quantthresh__16u1__p8_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p8_0,
 	1, -524582912, 1618345984, 4, 0,
-	_vq_quantlist__16u1__p8_0,
+	(long *)_vq_quantlist__16u1__p8_0,
 	NULL,
-	&_vq_auxt__16u1__p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p8_1[] = {
+static const long _vq_quantlist__16u1__p8_1[] = {
 	5,
 	4,
 	6,
@@ -1119,7 +1119,7 @@
 	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,35 +1130,35 @@
 	 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 = {
-	_vq_quantthresh__16u1__p8_1,
-	_vq_quantmap__16u1__p8_1,
+static const encode_aux_threshmatch _vq_auxt__16u1__p8_1 = {
+	(float *)_vq_quantthresh__16u1__p8_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p8_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16u1__p8_1,
+	(long *)_vq_quantlist__16u1__p8_1,
 	NULL,
-	&_vq_auxt__16u1__p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p9_0[] = {
+static const long _vq_quantlist__16u1__p9_0[] = {
 	7,
 	6,
 	8,
@@ -1176,7 +1176,7 @@
 	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,35 +1194,35 @@
 	 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 = {
-	_vq_quantthresh__16u1__p9_0,
-	_vq_quantmap__16u1__p9_0,
+static const encode_aux_threshmatch _vq_auxt__16u1__p9_0 = {
+	(float *)_vq_quantthresh__16u1__p9_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p9_0,
 	1, -514071552, 1627381760, 4, 0,
-	_vq_quantlist__16u1__p9_0,
+	(long *)_vq_quantlist__16u1__p9_0,
 	NULL,
-	&_vq_auxt__16u1__p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p9_1[] = {
+static const long _vq_quantlist__16u1__p9_1[] = {
 	7,
 	6,
 	8,
@@ -1240,7 +1240,7 @@
 	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,35 +1258,35 @@
 	 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 = {
-	_vq_quantthresh__16u1__p9_1,
-	_vq_quantmap__16u1__p9_1,
+static const encode_aux_threshmatch _vq_auxt__16u1__p9_1 = {
+	(float *)_vq_quantthresh__16u1__p9_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p9_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__16u1__p9_1,
+	(long *)_vq_quantlist__16u1__p9_1,
 	NULL,
-	&_vq_auxt__16u1__p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u1__p9_2[] = {
+static const long _vq_quantlist__16u1__p9_2[] = {
 	8,
 	7,
 	9,
@@ -1306,7 +1306,7 @@
 	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,36 +1328,36 @@
 	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 = {
-	_vq_quantthresh__16u1__p9_2,
-	_vq_quantmap__16u1__p9_2,
+static const encode_aux_threshmatch _vq_auxt__16u1__p9_2 = {
+	(float *)_vq_quantthresh__16u1__p9_2,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u1__p9_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__16u1__p9_2,
+	(long *)_vq_quantlist__16u1__p9_2,
 	NULL,
-	&_vq_auxt__16u1__p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__16u1__p9_2,
 	NULL,
 	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,9 +1367,9 @@
 	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,
+	(long *)_huff_lengthlist__16u1__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1378,7 +1378,7 @@
 	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,9 +1388,9 @@
 	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,
+	(long *)_huff_lengthlist__16u2__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1399,7 +1399,7 @@
 	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,9 +1409,9 @@
 	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,
+	(long *)_huff_lengthlist__16u2__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1420,13 +1420,13 @@
 	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,33 +1435,33 @@
 	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 = {
-	_vq_quantthresh__16u2_p1_0,
-	_vq_quantmap__16u2_p1_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p1_0 = {
+	(float *)_vq_quantthresh__16u2_p1_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__16u2_p1_0,
+	(long *)_vq_quantlist__16u2_p1_0,
 	NULL,
-	&_vq_auxt__16u2_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p2_0[] = {
+static const long _vq_quantlist__16u2_p2_0[] = {
 	2,
 	1,
 	3,
@@ -1469,7 +1469,7 @@
 	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,33 +1512,33 @@
 	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 = {
-	_vq_quantthresh__16u2_p2_0,
-	_vq_quantmap__16u2_p2_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p2_0 = {
+	(float *)_vq_quantthresh__16u2_p2_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u2_p2_0,
+	(long *)_vq_quantlist__16u2_p2_0,
 	NULL,
-	&_vq_auxt__16u2_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p3_0[] = {
+static const long _vq_quantlist__16u2_p3_0[] = {
 	4,
 	3,
 	5,
@@ -1550,7 +1550,7 @@
 	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,34 +1559,34 @@
 	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 = {
-	_vq_quantthresh__16u2_p3_0,
-	_vq_quantmap__16u2_p3_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p3_0 = {
+	(float *)_vq_quantthresh__16u2_p3_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__16u2_p3_0,
+	(long *)_vq_quantlist__16u2_p3_0,
 	NULL,
-	&_vq_auxt__16u2_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p4_0[] = {
+static const long _vq_quantlist__16u2_p4_0[] = {
 	8,
 	7,
 	9,
@@ -1606,7 +1606,7 @@
 	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,42 +1628,42 @@
 	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 = {
-	_vq_quantthresh__16u2_p4_0,
-	_vq_quantmap__16u2_p4_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p4_0 = {
+	(float *)_vq_quantthresh__16u2_p4_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__16u2_p4_0,
+	(long *)_vq_quantlist__16u2_p4_0,
 	NULL,
-	&_vq_auxt__16u2_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p4_0,
 	NULL,
 	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,33 +1672,33 @@
 	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 = {
-	_vq_quantthresh__16u2_p5_0,
-	_vq_quantmap__16u2_p5_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p5_0 = {
+	(float *)_vq_quantthresh__16u2_p5_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__16u2_p5_0,
+	(long *)_vq_quantlist__16u2_p5_0,
 	NULL,
-	&_vq_auxt__16u2_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p5_1[] = {
+static const long _vq_quantlist__16u2_p5_1[] = {
 	5,
 	4,
 	6,
@@ -1712,7 +1712,7 @@
 	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,35 +1723,35 @@
 	 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 = {
-	_vq_quantthresh__16u2_p5_1,
-	_vq_quantmap__16u2_p5_1,
+static const encode_aux_threshmatch _vq_auxt__16u2_p5_1 = {
+	(float *)_vq_quantthresh__16u2_p5_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16u2_p5_1,
+	(long *)_vq_quantlist__16u2_p5_1,
 	NULL,
-	&_vq_auxt__16u2_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p6_0[] = {
+static const long _vq_quantlist__16u2_p6_0[] = {
 	6,
 	5,
 	7,
@@ -1767,7 +1767,7 @@
 	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,35 +1781,35 @@
 	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 = {
-	_vq_quantthresh__16u2_p6_0,
-	_vq_quantmap__16u2_p6_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p6_0 = {
+	(float *)_vq_quantthresh__16u2_p6_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__16u2_p6_0,
+	(long *)_vq_quantlist__16u2_p6_0,
 	NULL,
-	&_vq_auxt__16u2_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p6_1[] = {
+static const long _vq_quantlist__16u2_p6_1[] = {
 	2,
 	1,
 	3,
@@ -1817,38 +1817,38 @@
 	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 = {
-	_vq_quantthresh__16u2_p6_1,
-	_vq_quantmap__16u2_p6_1,
+static const encode_aux_threshmatch _vq_auxt__16u2_p6_1 = {
+	(float *)_vq_quantthresh__16u2_p6_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__16u2_p6_1,
+	(long *)_vq_quantlist__16u2_p6_1,
 	NULL,
-	&_vq_auxt__16u2_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p7_0[] = {
+static const long _vq_quantlist__16u2_p7_0[] = {
 	6,
 	5,
 	7,
@@ -1864,7 +1864,7 @@
 	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,35 +1878,35 @@
 	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 = {
-	_vq_quantthresh__16u2_p7_0,
-	_vq_quantmap__16u2_p7_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p7_0 = {
+	(float *)_vq_quantthresh__16u2_p7_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__16u2_p7_0,
+	(long *)_vq_quantlist__16u2_p7_0,
 	NULL,
-	&_vq_auxt__16u2_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p7_1[] = {
+static const long _vq_quantlist__16u2_p7_1[] = {
 	5,
 	4,
 	6,
@@ -1920,7 +1920,7 @@
 	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,35 +1931,35 @@
 	 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 = {
-	_vq_quantthresh__16u2_p7_1,
-	_vq_quantmap__16u2_p7_1,
+static const encode_aux_threshmatch _vq_auxt__16u2_p7_1 = {
+	(float *)_vq_quantthresh__16u2_p7_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__16u2_p7_1,
+	(long *)_vq_quantlist__16u2_p7_1,
 	NULL,
-	&_vq_auxt__16u2_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p8_0[] = {
+static const long _vq_quantlist__16u2_p8_0[] = {
 	7,
 	6,
 	8,
@@ -1977,7 +1977,7 @@
 	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,35 +1995,35 @@
 	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 = {
-	_vq_quantthresh__16u2_p8_0,
-	_vq_quantmap__16u2_p8_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p8_0 = {
+	(float *)_vq_quantthresh__16u2_p8_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__16u2_p8_0,
+	(long *)_vq_quantlist__16u2_p8_0,
 	NULL,
-	&_vq_auxt__16u2_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p8_1[] = {
+static const long _vq_quantlist__16u2_p8_1[] = {
 	10,
 	9,
 	11,
@@ -2047,7 +2047,7 @@
 	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,37 +2078,37 @@
 	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 = {
-	_vq_quantthresh__16u2_p8_1,
-	_vq_quantmap__16u2_p8_1,
+static const encode_aux_threshmatch _vq_auxt__16u2_p8_1 = {
+	(float *)_vq_quantthresh__16u2_p8_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__16u2_p8_1,
+	(long *)_vq_quantlist__16u2_p8_1,
 	NULL,
-	&_vq_auxt__16u2_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p9_0[] = {
+static const long _vq_quantlist__16u2_p9_0[] = {
 	5586,
 	4655,
 	6517,
@@ -2126,7 +2126,7 @@
 	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,35 +2144,35 @@
 	 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 = {
-	_vq_quantthresh__16u2_p9_0,
-	_vq_quantmap__16u2_p9_0,
+static const encode_aux_threshmatch _vq_auxt__16u2_p9_0 = {
+	(float *)_vq_quantthresh__16u2_p9_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p9_0,
 	1, -510275072, 1611661312, 14, 0,
-	_vq_quantlist__16u2_p9_0,
+	(long *)_vq_quantlist__16u2_p9_0,
 	NULL,
-	&_vq_auxt__16u2_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p9_1[] = {
+static const long _vq_quantlist__16u2_p9_1[] = {
 	392,
 	343,
 	441,
@@ -2194,7 +2194,7 @@
 	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,37 +2220,37 @@
 	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 = {
-	_vq_quantthresh__16u2_p9_1,
-	_vq_quantmap__16u2_p9_1,
+static const encode_aux_threshmatch _vq_auxt__16u2_p9_1 = {
+	(float *)_vq_quantthresh__16u2_p9_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p9_1,
 	1, -518488064, 1611661312, 10, 0,
-	_vq_quantlist__16u2_p9_1,
+	(long *)_vq_quantlist__16u2_p9_1,
 	NULL,
-	&_vq_auxt__16u2_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__16u2_p9_2[] = {
+static const long _vq_quantlist__16u2_p9_2[] = {
 	24,
 	23,
 	25,
@@ -2302,14 +2302,14 @@
 	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 @@
 	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,31 +2328,31 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__16u2_p9_2 = {
-	_vq_quantthresh__16u2_p9_2,
-	_vq_quantmap__16u2_p9_2,
+static const encode_aux_threshmatch _vq_auxt__16u2_p9_2 = {
+	(float *)_vq_quantthresh__16u2_p9_2,
+	(long *)_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,
+	(long *)_vq_lengthlist__16u2_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__16u2_p9_2,
+	(long *)_vq_quantlist__16u2_p9_2,
 	NULL,
-	&_vq_auxt__16u2_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__16u2_p9_2,
 	NULL,
 	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,39 +2361,39 @@
 	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 = {
-	_vq_quantthresh__8u0__p1_0,
-	_vq_quantmap__8u0__p1_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p1_0 = {
+	(float *)_vq_quantthresh__8u0__p1_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u0__p1_0,
+	(long *)_vq_quantlist__8u0__p1_0,
 	NULL,
-	&_vq_auxt__8u0__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p1_0,
 	NULL,
 	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,33 +2402,33 @@
 	 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 = {
-	_vq_quantthresh__8u0__p2_0,
-	_vq_quantmap__8u0__p2_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p2_0 = {
+	(float *)_vq_quantthresh__8u0__p2_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u0__p2_0,
+	(long *)_vq_quantlist__8u0__p2_0,
 	NULL,
-	&_vq_auxt__8u0__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p3_0[] = {
+static const long _vq_quantlist__8u0__p3_0[] = {
 	2,
 	1,
 	3,
@@ -2436,7 +2436,7 @@
 	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,33 +2479,33 @@
 	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 = {
-	_vq_quantthresh__8u0__p3_0,
-	_vq_quantmap__8u0__p3_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p3_0 = {
+	(float *)_vq_quantthresh__8u0__p3_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u0__p3_0,
+	(long *)_vq_quantlist__8u0__p3_0,
 	NULL,
-	&_vq_auxt__8u0__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p4_0[] = {
+static const long _vq_quantlist__8u0__p4_0[] = {
 	2,
 	1,
 	3,
@@ -2513,7 +2513,7 @@
 	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,33 +2556,33 @@
 	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 = {
-	_vq_quantthresh__8u0__p4_0,
-	_vq_quantmap__8u0__p4_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p4_0 = {
+	(float *)_vq_quantthresh__8u0__p4_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u0__p4_0,
+	(long *)_vq_quantlist__8u0__p4_0,
 	NULL,
-	&_vq_auxt__8u0__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p5_0[] = {
+static const long _vq_quantlist__8u0__p5_0[] = {
 	4,
 	3,
 	5,
@@ -2594,7 +2594,7 @@
 	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,34 +2603,34 @@
 	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 = {
-	_vq_quantthresh__8u0__p5_0,
-	_vq_quantmap__8u0__p5_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p5_0 = {
+	(float *)_vq_quantthresh__8u0__p5_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8u0__p5_0,
+	(long *)_vq_quantlist__8u0__p5_0,
 	NULL,
-	&_vq_auxt__8u0__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p6_0[] = {
+static const long _vq_quantlist__8u0__p6_0[] = {
 	6,
 	5,
 	7,
@@ -2646,7 +2646,7 @@
 	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,35 +2660,35 @@
 	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 = {
-	_vq_quantthresh__8u0__p6_0,
-	_vq_quantmap__8u0__p6_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p6_0 = {
+	(float *)_vq_quantthresh__8u0__p6_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__8u0__p6_0,
+	(long *)_vq_quantlist__8u0__p6_0,
 	NULL,
-	&_vq_auxt__8u0__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p6_1[] = {
+static const long _vq_quantlist__8u0__p6_1[] = {
 	2,
 	1,
 	3,
@@ -2696,44 +2696,44 @@
 	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 = {
-	_vq_quantthresh__8u0__p6_1,
-	_vq_quantmap__8u0__p6_1,
+static const encode_aux_threshmatch _vq_auxt__8u0__p6_1 = {
+	(float *)_vq_quantthresh__8u0__p6_1,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u0__p6_1,
+	(long *)_vq_quantlist__8u0__p6_1,
 	NULL,
-	&_vq_auxt__8u0__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p6_1,
 	NULL,
 	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,33 +2742,33 @@
 	 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 = {
-	_vq_quantthresh__8u0__p7_0,
-	_vq_quantmap__8u0__p7_0,
+static const encode_aux_threshmatch _vq_auxt__8u0__p7_0 = {
+	(float *)_vq_quantthresh__8u0__p7_0,
+	(long *)_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,
+	(long *)_vq_lengthlist__8u0__p7_0,
 	1, -518803456, 1628680192, 2, 0,
-	_vq_quantlist__8u0__p7_0,
+	(long *)_vq_quantlist__8u0__p7_0,
 	NULL,
-	&_vq_auxt__8u0__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p7_1[] = {
+static const long _vq_quantlist__8u0__p7_1[] = {
 	7,
 	6,
 	8,
@@ -2786,7 +2786,7 @@
 	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,35 +2804,35 @@
 	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 = {
-	_vq_quantthresh__8u0__p7_1,
-	_vq_quantmap__8u0__p7_1,
+static const encode_aux_threshmatch _vq_auxt__8u0__p7_1 = {
+	(float *)_vq_quantthresh__8u0__p7_1,
+	(long *)_vq_quantmap__8u0__p7_1,
 	15,
 	15
 };
 
-static static_codebook _8u0__p7_1 = {
+static const static_codebook _8u0__p7_1 = {
 	2, 225,
-	_vq_lengthlist__8u0__p7_1,
+	(long *)_vq_lengthlist__8u0__p7_1,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__8u0__p7_1,
+	(long *)_vq_quantlist__8u0__p7_1,
 	NULL,
-	&_vq_auxt__8u0__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p7_2[] = {
+static const long _vq_quantlist__8u0__p7_2[] = {
 	10,
 	9,
 	11,
@@ -2856,7 +2856,7 @@
 	20,
 };
 
-static long _vq_lengthlist__8u0__p7_2[] = {
+static const long _vq_lengthlist__8u0__p7_2[] = {
 	 1, 6, 5, 7, 7, 9, 9, 9, 9,10,12,12,10,11,11,10,
 	11,11,11,10,11, 6, 8, 8, 9, 9,10,10, 9,10,11,11,
 	10,11,11,11,11,10,11,11,11,11, 6, 7, 8, 9, 9, 9,
@@ -2887,46 +2887,46 @@
 	11,12,11,11,11,10,10,11,11,
 };
 
-static float _vq_quantthresh__8u0__p7_2[] = {
+static const float _vq_quantthresh__8u0__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__8u0__p7_2[] = {
+static const long _vq_quantmap__8u0__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__8u0__p7_2 = {
-	_vq_quantthresh__8u0__p7_2,
-	_vq_quantmap__8u0__p7_2,
+static const encode_aux_threshmatch _vq_auxt__8u0__p7_2 = {
+	(float *)_vq_quantthresh__8u0__p7_2,
+	(long *)_vq_quantmap__8u0__p7_2,
 	21,
 	21
 };
 
-static static_codebook _8u0__p7_2 = {
+static const static_codebook _8u0__p7_2 = {
 	2, 441,
-	_vq_lengthlist__8u0__p7_2,
+	(long *)_vq_lengthlist__8u0__p7_2,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__8u0__p7_2,
+	(long *)_vq_quantlist__8u0__p7_2,
 	NULL,
-	&_vq_auxt__8u0__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__8u0__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__8u0__single[] = {
+static const long _huff_lengthlist__8u0__single[] = {
 	 4, 7,11, 9,12, 8, 7,10, 6, 4, 5, 5, 7, 5, 6,16,
 	 9, 5, 5, 6, 7, 7, 9,16, 7, 4, 6, 5, 7, 5, 7,17,
 	10, 7, 7, 8, 7, 7, 8,18, 7, 5, 6, 4, 5, 4, 5,15,
 	 7, 6, 7, 5, 6, 4, 5,15,12,13,18,12,17,11, 9,17,
 };
 
-static static_codebook _huff_book__8u0__single = {
+static const static_codebook _huff_book__8u0__single = {
 	2, 64,
-	_huff_lengthlist__8u0__single,
+	(long *)_huff_lengthlist__8u0__single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -2935,13 +2935,13 @@
 	0
 };
 
-static long _vq_quantlist__8u1__p1_0[] = {
+static const long _vq_quantlist__8u1__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8u1__p1_0[] = {
+static const long _vq_lengthlist__8u1__p1_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9,10, 7,
 	 9, 9, 5, 8, 8, 7,10, 9, 7, 9, 9, 5, 8, 8, 8,10,
 	10, 8,10,10, 7,10,10, 9,10,12,10,12,12, 7,10,10,
@@ -2950,39 +2950,39 @@
 	10,
 };
 
-static float _vq_quantthresh__8u1__p1_0[] = {
+static const float _vq_quantthresh__8u1__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8u1__p1_0[] = {
+static const long _vq_quantmap__8u1__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p1_0 = {
-	_vq_quantthresh__8u1__p1_0,
-	_vq_quantmap__8u1__p1_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p1_0 = {
+	(float *)_vq_quantthresh__8u1__p1_0,
+	(long *)_vq_quantmap__8u1__p1_0,
 	3,
 	3
 };
 
-static static_codebook _8u1__p1_0 = {
+static const static_codebook _8u1__p1_0 = {
 	4, 81,
-	_vq_lengthlist__8u1__p1_0,
+	(long *)_vq_lengthlist__8u1__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u1__p1_0,
+	(long *)_vq_quantlist__8u1__p1_0,
 	NULL,
-	&_vq_auxt__8u1__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p2_0[] = {
+static const long _vq_quantlist__8u1__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8u1__p2_0[] = {
+static const long _vq_lengthlist__8u1__p2_0[] = {
 	 3, 4, 5, 5, 6, 6, 5, 6, 6, 5, 7, 6, 6, 7, 8, 6,
 	 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 7, 8,
 	 8, 6, 7, 7, 6, 8, 7, 7, 7, 9, 8, 9, 9, 6, 7, 8,
@@ -2991,33 +2991,33 @@
 	 7,
 };
 
-static float _vq_quantthresh__8u1__p2_0[] = {
+static const float _vq_quantthresh__8u1__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8u1__p2_0[] = {
+static const long _vq_quantmap__8u1__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p2_0 = {
-	_vq_quantthresh__8u1__p2_0,
-	_vq_quantmap__8u1__p2_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p2_0 = {
+	(float *)_vq_quantthresh__8u1__p2_0,
+	(long *)_vq_quantmap__8u1__p2_0,
 	3,
 	3
 };
 
-static static_codebook _8u1__p2_0 = {
+static const static_codebook _8u1__p2_0 = {
 	4, 81,
-	_vq_lengthlist__8u1__p2_0,
+	(long *)_vq_lengthlist__8u1__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u1__p2_0,
+	(long *)_vq_quantlist__8u1__p2_0,
 	NULL,
-	&_vq_auxt__8u1__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p3_0[] = {
+static const long _vq_quantlist__8u1__p3_0[] = {
 	2,
 	1,
 	3,
@@ -3025,7 +3025,7 @@
 	4,
 };
 
-static long _vq_lengthlist__8u1__p3_0[] = {
+static const long _vq_lengthlist__8u1__p3_0[] = {
 	 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
 	10, 9,11,11, 9, 9, 9,11,11, 6, 8, 8,10,10, 8,10,
 	10,11,11, 8, 9,10,11,11,10,11,11,12,12,10,11,11,
@@ -3068,33 +3068,33 @@
 	16,
 };
 
-static float _vq_quantthresh__8u1__p3_0[] = {
+static const float _vq_quantthresh__8u1__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u1__p3_0[] = {
+static const long _vq_quantmap__8u1__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p3_0 = {
-	_vq_quantthresh__8u1__p3_0,
-	_vq_quantmap__8u1__p3_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p3_0 = {
+	(float *)_vq_quantthresh__8u1__p3_0,
+	(long *)_vq_quantmap__8u1__p3_0,
 	5,
 	5
 };
 
-static static_codebook _8u1__p3_0 = {
+static const static_codebook _8u1__p3_0 = {
 	4, 625,
-	_vq_lengthlist__8u1__p3_0,
+	(long *)_vq_lengthlist__8u1__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u1__p3_0,
+	(long *)_vq_quantlist__8u1__p3_0,
 	NULL,
-	&_vq_auxt__8u1__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p4_0[] = {
+static const long _vq_quantlist__8u1__p4_0[] = {
 	2,
 	1,
 	3,
@@ -3102,7 +3102,7 @@
 	4,
 };
 
-static long _vq_lengthlist__8u1__p4_0[] = {
+static const long _vq_lengthlist__8u1__p4_0[] = {
 	 4, 5, 5, 9, 9, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 9,
 	 9, 9,11,11, 9, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 7,
 	 8, 9,10, 7, 7, 8, 9,10, 9, 9,10,10,11, 9, 9,10,
@@ -3145,33 +3145,33 @@
 	10,
 };
 
-static float _vq_quantthresh__8u1__p4_0[] = {
+static const float _vq_quantthresh__8u1__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u1__p4_0[] = {
+static const long _vq_quantmap__8u1__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p4_0 = {
-	_vq_quantthresh__8u1__p4_0,
-	_vq_quantmap__8u1__p4_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p4_0 = {
+	(float *)_vq_quantthresh__8u1__p4_0,
+	(long *)_vq_quantmap__8u1__p4_0,
 	5,
 	5
 };
 
-static static_codebook _8u1__p4_0 = {
+static const static_codebook _8u1__p4_0 = {
 	4, 625,
-	_vq_lengthlist__8u1__p4_0,
+	(long *)_vq_lengthlist__8u1__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u1__p4_0,
+	(long *)_vq_quantlist__8u1__p4_0,
 	NULL,
-	&_vq_auxt__8u1__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p5_0[] = {
+static const long _vq_quantlist__8u1__p5_0[] = {
 	4,
 	3,
 	5,
@@ -3183,7 +3183,7 @@
 	8,
 };
 
-static long _vq_lengthlist__8u1__p5_0[] = {
+static const long _vq_lengthlist__8u1__p5_0[] = {
 	 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 5, 8, 7, 8, 8,
 	10,10, 4, 6, 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, 8, 8, 8,
@@ -3192,34 +3192,34 @@
 	13,
 };
 
-static float _vq_quantthresh__8u1__p5_0[] = {
+static const float _vq_quantthresh__8u1__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8u1__p5_0[] = {
+static const long _vq_quantmap__8u1__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p5_0 = {
-	_vq_quantthresh__8u1__p5_0,
-	_vq_quantmap__8u1__p5_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p5_0 = {
+	(float *)_vq_quantthresh__8u1__p5_0,
+	(long *)_vq_quantmap__8u1__p5_0,
 	9,
 	9
 };
 
-static static_codebook _8u1__p5_0 = {
+static const static_codebook _8u1__p5_0 = {
 	2, 81,
-	_vq_lengthlist__8u1__p5_0,
+	(long *)_vq_lengthlist__8u1__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p5_0,
+	(long *)_vq_quantlist__8u1__p5_0,
 	NULL,
-	&_vq_auxt__8u1__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p6_0[] = {
+static const long _vq_quantlist__8u1__p6_0[] = {
 	4,
 	3,
 	5,
@@ -3231,7 +3231,7 @@
 	8,
 };
 
-static long _vq_lengthlist__8u1__p6_0[] = {
+static const long _vq_lengthlist__8u1__p6_0[] = {
 	 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7,
 	 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7,
 	 8, 8, 9, 9, 6, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7,
@@ -3240,40 +3240,40 @@
 	10,
 };
 
-static float _vq_quantthresh__8u1__p6_0[] = {
+static const float _vq_quantthresh__8u1__p6_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__8u1__p6_0[] = {
+static const long _vq_quantmap__8u1__p6_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p6_0 = {
-	_vq_quantthresh__8u1__p6_0,
-	_vq_quantmap__8u1__p6_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p6_0 = {
+	(float *)_vq_quantthresh__8u1__p6_0,
+	(long *)_vq_quantmap__8u1__p6_0,
 	9,
 	9
 };
 
-static static_codebook _8u1__p6_0 = {
+static const static_codebook _8u1__p6_0 = {
 	2, 81,
-	_vq_lengthlist__8u1__p6_0,
+	(long *)_vq_lengthlist__8u1__p6_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p6_0,
+	(long *)_vq_quantlist__8u1__p6_0,
 	NULL,
-	&_vq_auxt__8u1__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p7_0[] = {
+static const long _vq_quantlist__8u1__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8u1__p7_0[] = {
+static const long _vq_lengthlist__8u1__p7_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,10,10, 8,
 	10,10, 5, 9, 9, 7,10,10, 8,10,10, 4,10,10, 9,12,
 	12, 9,11,11, 7,12,11,10,11,13,10,13,13, 7,12,12,
@@ -3282,33 +3282,33 @@
 	11,
 };
 
-static float _vq_quantthresh__8u1__p7_0[] = {
+static const float _vq_quantthresh__8u1__p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__8u1__p7_0[] = {
+static const long _vq_quantmap__8u1__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p7_0 = {
-	_vq_quantthresh__8u1__p7_0,
-	_vq_quantmap__8u1__p7_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p7_0 = {
+	(float *)_vq_quantthresh__8u1__p7_0,
+	(long *)_vq_quantmap__8u1__p7_0,
 	3,
 	3
 };
 
-static static_codebook _8u1__p7_0 = {
+static const static_codebook _8u1__p7_0 = {
 	4, 81,
-	_vq_lengthlist__8u1__p7_0,
+	(long *)_vq_lengthlist__8u1__p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__8u1__p7_0,
+	(long *)_vq_quantlist__8u1__p7_0,
 	NULL,
-	&_vq_auxt__8u1__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p7_1[] = {
+static const long _vq_quantlist__8u1__p7_1[] = {
 	5,
 	4,
 	6,
@@ -3322,7 +3322,7 @@
 	10,
 };
 
-static long _vq_lengthlist__8u1__p7_1[] = {
+static const long _vq_lengthlist__8u1__p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7,
 	 8, 8, 9, 9, 9, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 9,
 	 9, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8,
@@ -3333,35 +3333,35 @@
 	 9, 9, 9, 9, 9,10,10,10,10,
 };
 
-static float _vq_quantthresh__8u1__p7_1[] = {
+static const float _vq_quantthresh__8u1__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__8u1__p7_1[] = {
+static const long _vq_quantmap__8u1__p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p7_1 = {
-	_vq_quantthresh__8u1__p7_1,
-	_vq_quantmap__8u1__p7_1,
+static const encode_aux_threshmatch _vq_auxt__8u1__p7_1 = {
+	(float *)_vq_quantthresh__8u1__p7_1,
+	(long *)_vq_quantmap__8u1__p7_1,
 	11,
 	11
 };
 
-static static_codebook _8u1__p7_1 = {
+static const static_codebook _8u1__p7_1 = {
 	2, 121,
-	_vq_lengthlist__8u1__p7_1,
+	(long *)_vq_lengthlist__8u1__p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p7_1,
+	(long *)_vq_quantlist__8u1__p7_1,
 	NULL,
-	&_vq_auxt__8u1__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p8_0[] = {
+static const long _vq_quantlist__8u1__p8_0[] = {
 	5,
 	4,
 	6,
@@ -3375,7 +3375,7 @@
 	10,
 };
 
-static long _vq_lengthlist__8u1__p8_0[] = {
+static const long _vq_lengthlist__8u1__p8_0[] = {
 	 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7,
 	 9, 9,11,11,13,12, 4, 6, 6, 7, 7, 9, 9,11,11,12,
 	12, 6, 7, 7, 9, 9,11,11,12,12,13,13, 6, 7, 7, 9,
@@ -3386,35 +3386,35 @@
 	12,13,13,14,14,15,15,15,15,
 };
 
-static float _vq_quantthresh__8u1__p8_0[] = {
+static const float _vq_quantthresh__8u1__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__8u1__p8_0[] = {
+static const long _vq_quantmap__8u1__p8_0[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p8_0 = {
-	_vq_quantthresh__8u1__p8_0,
-	_vq_quantmap__8u1__p8_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p8_0 = {
+	(float *)_vq_quantthresh__8u1__p8_0,
+	(long *)_vq_quantmap__8u1__p8_0,
 	11,
 	11
 };
 
-static static_codebook _8u1__p8_0 = {
+static const static_codebook _8u1__p8_0 = {
 	2, 121,
-	_vq_lengthlist__8u1__p8_0,
+	(long *)_vq_lengthlist__8u1__p8_0,
 	1, -524582912, 1618345984, 4, 0,
-	_vq_quantlist__8u1__p8_0,
+	(long *)_vq_quantlist__8u1__p8_0,
 	NULL,
-	&_vq_auxt__8u1__p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p8_1[] = {
+static const long _vq_quantlist__8u1__p8_1[] = {
 	5,
 	4,
 	6,
@@ -3428,7 +3428,7 @@
 	10,
 };
 
-static long _vq_lengthlist__8u1__p8_1[] = {
+static const long _vq_lengthlist__8u1__p8_1[] = {
 	 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7,
 	 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8,
 	 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7,
@@ -3439,35 +3439,35 @@
 	 8, 8, 8, 8, 8, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__8u1__p8_1[] = {
+static const float _vq_quantthresh__8u1__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__8u1__p8_1[] = {
+static const long _vq_quantmap__8u1__p8_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p8_1 = {
-	_vq_quantthresh__8u1__p8_1,
-	_vq_quantmap__8u1__p8_1,
+static const encode_aux_threshmatch _vq_auxt__8u1__p8_1 = {
+	(float *)_vq_quantthresh__8u1__p8_1,
+	(long *)_vq_quantmap__8u1__p8_1,
 	11,
 	11
 };
 
-static static_codebook _8u1__p8_1 = {
+static const static_codebook _8u1__p8_1 = {
 	2, 121,
-	_vq_lengthlist__8u1__p8_1,
+	(long *)_vq_lengthlist__8u1__p8_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p8_1,
+	(long *)_vq_quantlist__8u1__p8_1,
 	NULL,
-	&_vq_auxt__8u1__p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p9_0[] = {
+static const long _vq_quantlist__8u1__p9_0[] = {
 	7,
 	6,
 	8,
@@ -3485,7 +3485,7 @@
 	14,
 };
 
-static long _vq_lengthlist__8u1__p9_0[] = {
+static const long _vq_lengthlist__8u1__p9_0[] = {
 	 1, 4, 4,11,11,11,11,11,11,11,11,11,11,11,11, 3,
 	11, 8,11,11,11,11,11,11,11,11,11,11,11,11, 3, 9,
 	 9,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -3503,35 +3503,35 @@
 	10,
 };
 
-static float _vq_quantthresh__8u1__p9_0[] = {
+static const float _vq_quantthresh__8u1__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__8u1__p9_0[] = {
+static const long _vq_quantmap__8u1__p9_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p9_0 = {
-	_vq_quantthresh__8u1__p9_0,
-	_vq_quantmap__8u1__p9_0,
+static const encode_aux_threshmatch _vq_auxt__8u1__p9_0 = {
+	(float *)_vq_quantthresh__8u1__p9_0,
+	(long *)_vq_quantmap__8u1__p9_0,
 	15,
 	15
 };
 
-static static_codebook _8u1__p9_0 = {
+static const static_codebook _8u1__p9_0 = {
 	2, 225,
-	_vq_lengthlist__8u1__p9_0,
+	(long *)_vq_lengthlist__8u1__p9_0,
 	1, -514071552, 1627381760, 4, 0,
-	_vq_quantlist__8u1__p9_0,
+	(long *)_vq_quantlist__8u1__p9_0,
 	NULL,
-	&_vq_auxt__8u1__p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p9_1[] = {
+static const long _vq_quantlist__8u1__p9_1[] = {
 	7,
 	6,
 	8,
@@ -3549,7 +3549,7 @@
 	14,
 };
 
-static long _vq_lengthlist__8u1__p9_1[] = {
+static const long _vq_lengthlist__8u1__p9_1[] = {
 	 1, 4, 4, 7, 7, 9, 9, 7, 7, 8, 8,10,10,11,11, 4,
 	 7, 7, 9, 9,10,10, 8, 8,10,10,10,11,10,11, 4, 7,
 	 7, 9, 9,10,10, 8, 8,10, 9,11,11,11,11, 7, 9, 9,
@@ -3567,35 +3567,35 @@
 	13,
 };
 
-static float _vq_quantthresh__8u1__p9_1[] = {
+static const float _vq_quantthresh__8u1__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__8u1__p9_1[] = {
+static const long _vq_quantmap__8u1__p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__8u1__p9_1 = {
-	_vq_quantthresh__8u1__p9_1,
-	_vq_quantmap__8u1__p9_1,
+static const encode_aux_threshmatch _vq_auxt__8u1__p9_1 = {
+	(float *)_vq_quantthresh__8u1__p9_1,
+	(long *)_vq_quantmap__8u1__p9_1,
 	15,
 	15
 };
 
-static static_codebook _8u1__p9_1 = {
+static const static_codebook _8u1__p9_1 = {
 	2, 225,
-	_vq_lengthlist__8u1__p9_1,
+	(long *)_vq_lengthlist__8u1__p9_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__8u1__p9_1,
+	(long *)_vq_quantlist__8u1__p9_1,
 	NULL,
-	&_vq_auxt__8u1__p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p9_2[] = {
+static const long _vq_quantlist__8u1__p9_2[] = {
 	8,
 	7,
 	9,
@@ -3615,7 +3615,7 @@
 	16,
 };
 
-static long _vq_lengthlist__8u1__p9_2[] = {
+static const long _vq_lengthlist__8u1__p9_2[] = {
 	 2, 5, 4, 6, 6, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9,
@@ -3637,36 +3637,36 @@
 	10,
 };
 
-static float _vq_quantthresh__8u1__p9_2[] = {
+static const float _vq_quantthresh__8u1__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__8u1__p9_2[] = {
+static const long _vq_quantmap__8u1__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__8u1__p9_2 = {
-	_vq_quantthresh__8u1__p9_2,
-	_vq_quantmap__8u1__p9_2,
+static const encode_aux_threshmatch _vq_auxt__8u1__p9_2 = {
+	(float *)_vq_quantthresh__8u1__p9_2,
+	(long *)_vq_quantmap__8u1__p9_2,
 	17,
 	17
 };
 
-static static_codebook _8u1__p9_2 = {
+static const static_codebook _8u1__p9_2 = {
 	2, 289,
-	_vq_lengthlist__8u1__p9_2,
+	(long *)_vq_lengthlist__8u1__p9_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__8u1__p9_2,
+	(long *)_vq_quantlist__8u1__p9_2,
 	NULL,
-	&_vq_auxt__8u1__p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__8u1__p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__8u1__single[] = {
+static const long _huff_lengthlist__8u1__single[] = {
 	 4, 7,13, 9,15, 9,16, 8,10,13, 7, 5, 8, 6, 9, 7,
 	10, 7,10,11,11, 6, 7, 8, 8, 9, 9, 9,12,16, 8, 5,
 	 8, 6, 8, 6, 9, 7,10,12,11, 7, 7, 7, 6, 7, 7, 7,
@@ -3676,9 +3676,9 @@
 	13, 8, 8,15,
 };
 
-static static_codebook _huff_book__8u1__single = {
+static const static_codebook _huff_book__8u1__single = {
 	2, 100,
-	_huff_lengthlist__8u1__single,
+	(long *)_huff_lengthlist__8u1__single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -3687,16 +3687,16 @@
 	0
 };
 
-static long _huff_lengthlist__44u0__long[] = {
+static const long _huff_lengthlist__44u0__long[] = {
 	 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16,
 	13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18,
 	15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17,
 	 9, 8,10, 8,10, 5, 4,11,12,17,19,14,16,10, 7,12,
 };
 
-static static_codebook _huff_book__44u0__long = {
+static const static_codebook _huff_book__44u0__long = {
 	2, 64,
-	_huff_lengthlist__44u0__long,
+	(long *)_huff_lengthlist__44u0__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -3705,13 +3705,13 @@
 	0
 };
 
-static long _vq_quantlist__44u0__p1_0[] = {
+static const long _vq_quantlist__44u0__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u0__p1_0[] = {
+static const long _vq_lengthlist__44u0__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8,
 	10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11,
 	11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11,
@@ -3720,39 +3720,39 @@
 	13,
 };
 
-static float _vq_quantthresh__44u0__p1_0[] = {
+static const float _vq_quantthresh__44u0__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u0__p1_0[] = {
+static const long _vq_quantmap__44u0__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p1_0 = {
-	_vq_quantthresh__44u0__p1_0,
-	_vq_quantmap__44u0__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p1_0 = {
+	(float *)_vq_quantthresh__44u0__p1_0,
+	(long *)_vq_quantmap__44u0__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u0__p1_0 = {
+static const static_codebook _44u0__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u0__p1_0,
+	(long *)_vq_lengthlist__44u0__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u0__p1_0,
+	(long *)_vq_quantlist__44u0__p1_0,
 	NULL,
-	&_vq_auxt__44u0__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p2_0[] = {
+static const long _vq_quantlist__44u0__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u0__p2_0[] = {
+static const long _vq_lengthlist__44u0__p2_0[] = {
 	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6,
 	 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8,
 	 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8,
@@ -3761,33 +3761,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u0__p2_0[] = {
+static const float _vq_quantthresh__44u0__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u0__p2_0[] = {
+static const long _vq_quantmap__44u0__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p2_0 = {
-	_vq_quantthresh__44u0__p2_0,
-	_vq_quantmap__44u0__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p2_0 = {
+	(float *)_vq_quantthresh__44u0__p2_0,
+	(long *)_vq_quantmap__44u0__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u0__p2_0 = {
+static const static_codebook _44u0__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u0__p2_0,
+	(long *)_vq_lengthlist__44u0__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u0__p2_0,
+	(long *)_vq_quantlist__44u0__p2_0,
 	NULL,
-	&_vq_auxt__44u0__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p3_0[] = {
+static const long _vq_quantlist__44u0__p3_0[] = {
 	2,
 	1,
 	3,
@@ -3795,7 +3795,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u0__p3_0[] = {
+static const long _vq_lengthlist__44u0__p3_0[] = {
 	 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9,
 	10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10,
 	10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11,
@@ -3838,33 +3838,33 @@
 	19,
 };
 
-static float _vq_quantthresh__44u0__p3_0[] = {
+static const float _vq_quantthresh__44u0__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u0__p3_0[] = {
+static const long _vq_quantmap__44u0__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p3_0 = {
-	_vq_quantthresh__44u0__p3_0,
-	_vq_quantmap__44u0__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p3_0 = {
+	(float *)_vq_quantthresh__44u0__p3_0,
+	(long *)_vq_quantmap__44u0__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u0__p3_0 = {
+static const static_codebook _44u0__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u0__p3_0,
+	(long *)_vq_lengthlist__44u0__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u0__p3_0,
+	(long *)_vq_quantlist__44u0__p3_0,
 	NULL,
-	&_vq_auxt__44u0__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p4_0[] = {
+static const long _vq_quantlist__44u0__p4_0[] = {
 	2,
 	1,
 	3,
@@ -3872,7 +3872,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u0__p4_0[] = {
+static const long _vq_lengthlist__44u0__p4_0[] = {
 	 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9,
 	10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7,
 	 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10,
@@ -3915,33 +3915,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44u0__p4_0[] = {
+static const float _vq_quantthresh__44u0__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u0__p4_0[] = {
+static const long _vq_quantmap__44u0__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p4_0 = {
-	_vq_quantthresh__44u0__p4_0,
-	_vq_quantmap__44u0__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p4_0 = {
+	(float *)_vq_quantthresh__44u0__p4_0,
+	(long *)_vq_quantmap__44u0__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u0__p4_0 = {
+static const static_codebook _44u0__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u0__p4_0,
+	(long *)_vq_lengthlist__44u0__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u0__p4_0,
+	(long *)_vq_quantlist__44u0__p4_0,
 	NULL,
-	&_vq_auxt__44u0__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p5_0[] = {
+static const long _vq_quantlist__44u0__p5_0[] = {
 	4,
 	3,
 	5,
@@ -3953,7 +3953,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u0__p5_0[] = {
+static const long _vq_lengthlist__44u0__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,10, 7, 8, 8,
@@ -3962,34 +3962,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44u0__p5_0[] = {
+static const float _vq_quantthresh__44u0__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u0__p5_0[] = {
+static const long _vq_quantmap__44u0__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p5_0 = {
-	_vq_quantthresh__44u0__p5_0,
-	_vq_quantmap__44u0__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p5_0 = {
+	(float *)_vq_quantthresh__44u0__p5_0,
+	(long *)_vq_quantmap__44u0__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u0__p5_0 = {
+static const static_codebook _44u0__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u0__p5_0,
+	(long *)_vq_lengthlist__44u0__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u0__p5_0,
+	(long *)_vq_quantlist__44u0__p5_0,
 	NULL,
-	&_vq_auxt__44u0__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p6_0[] = {
+static const long _vq_quantlist__44u0__p6_0[] = {
 	6,
 	5,
 	7,
@@ -4005,7 +4005,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u0__p6_0[] = {
+static const long _vq_lengthlist__44u0__p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5,
 	 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9,
 	 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11,
@@ -4019,35 +4019,35 @@
 	15,17,16,17,18,17,17,18, 0,
 };
 
-static float _vq_quantthresh__44u0__p6_0[] = {
+static const float _vq_quantthresh__44u0__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__44u0__p6_0[] = {
+static const long _vq_quantmap__44u0__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p6_0 = {
-	_vq_quantthresh__44u0__p6_0,
-	_vq_quantmap__44u0__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p6_0 = {
+	(float *)_vq_quantthresh__44u0__p6_0,
+	(long *)_vq_quantmap__44u0__p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u0__p6_0 = {
+static const static_codebook _44u0__p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u0__p6_0,
+	(long *)_vq_lengthlist__44u0__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u0__p6_0,
+	(long *)_vq_quantlist__44u0__p6_0,
 	NULL,
-	&_vq_auxt__44u0__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p6_1[] = {
+static const long _vq_quantlist__44u0__p6_1[] = {
 	2,
 	1,
 	3,
@@ -4055,38 +4055,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u0__p6_1[] = {
+static const long _vq_lengthlist__44u0__p6_1[] = {
 	 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5,
 	 6, 6, 6, 6, 5, 6, 6, 6, 6,
 };
 
-static float _vq_quantthresh__44u0__p6_1[] = {
+static const float _vq_quantthresh__44u0__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u0__p6_1[] = {
+static const long _vq_quantmap__44u0__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p6_1 = {
-	_vq_quantthresh__44u0__p6_1,
-	_vq_quantmap__44u0__p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u0__p6_1 = {
+	(float *)_vq_quantthresh__44u0__p6_1,
+	(long *)_vq_quantmap__44u0__p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u0__p6_1 = {
+static const static_codebook _44u0__p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u0__p6_1,
+	(long *)_vq_lengthlist__44u0__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u0__p6_1,
+	(long *)_vq_quantlist__44u0__p6_1,
 	NULL,
-	&_vq_auxt__44u0__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p7_0[] = {
+static const long _vq_quantlist__44u0__p7_0[] = {
 	2,
 	1,
 	3,
@@ -4094,7 +4094,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u0__p7_0[] = {
+static const long _vq_lengthlist__44u0__p7_0[] = {
 	 1, 4, 4,11,11, 9,11,11,11,11,11,11,11,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -4137,33 +4137,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u0__p7_0[] = {
+static const float _vq_quantthresh__44u0__p7_0[] = {
 	-253.5, -84.5, 84.5, 253.5, 
 };
 
-static long _vq_quantmap__44u0__p7_0[] = {
+static const long _vq_quantmap__44u0__p7_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p7_0 = {
-	_vq_quantthresh__44u0__p7_0,
-	_vq_quantmap__44u0__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u0__p7_0 = {
+	(float *)_vq_quantthresh__44u0__p7_0,
+	(long *)_vq_quantmap__44u0__p7_0,
 	5,
 	5
 };
 
-static static_codebook _44u0__p7_0 = {
+static const static_codebook _44u0__p7_0 = {
 	4, 625,
-	_vq_lengthlist__44u0__p7_0,
+	(long *)_vq_lengthlist__44u0__p7_0,
 	1, -518709248, 1626677248, 3, 0,
-	_vq_quantlist__44u0__p7_0,
+	(long *)_vq_quantlist__44u0__p7_0,
 	NULL,
-	&_vq_auxt__44u0__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p7_1[] = {
+static const long _vq_quantlist__44u0__p7_1[] = {
 	6,
 	5,
 	7,
@@ -4179,7 +4179,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u0__p7_1[] = {
+static const long _vq_lengthlist__44u0__p7_1[] = {
 	 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7,
 	 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7,
 	 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10,
@@ -4193,35 +4193,35 @@
 	15,15,15,15,15,15,15,15,15,
 };
 
-static float _vq_quantthresh__44u0__p7_1[] = {
+static const float _vq_quantthresh__44u0__p7_1[] = {
 	-71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, 
 	32.5, 45.5, 58.5, 71.5, 
 };
 
-static long _vq_quantmap__44u0__p7_1[] = {
+static const long _vq_quantmap__44u0__p7_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p7_1 = {
-	_vq_quantthresh__44u0__p7_1,
-	_vq_quantmap__44u0__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u0__p7_1 = {
+	(float *)_vq_quantthresh__44u0__p7_1,
+	(long *)_vq_quantmap__44u0__p7_1,
 	13,
 	13
 };
 
-static static_codebook _44u0__p7_1 = {
+static const static_codebook _44u0__p7_1 = {
 	2, 169,
-	_vq_lengthlist__44u0__p7_1,
+	(long *)_vq_lengthlist__44u0__p7_1,
 	1, -523010048, 1618608128, 4, 0,
-	_vq_quantlist__44u0__p7_1,
+	(long *)_vq_quantlist__44u0__p7_1,
 	NULL,
-	&_vq_auxt__44u0__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u0__p7_2[] = {
+static const long _vq_quantlist__44u0__p7_2[] = {
 	6,
 	5,
 	7,
@@ -4237,7 +4237,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u0__p7_2[] = {
+static const long _vq_lengthlist__44u0__p7_2[] = {
 	 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6,
 	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8,
 	 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8,
@@ -4251,44 +4251,44 @@
 	 9, 9, 9,10, 9, 9,10,10, 9,
 };
 
-static float _vq_quantthresh__44u0__p7_2[] = {
+static const float _vq_quantthresh__44u0__p7_2[] = {
 	-5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 
 	2.5, 3.5, 4.5, 5.5, 
 };
 
-static long _vq_quantmap__44u0__p7_2[] = {
+static const long _vq_quantmap__44u0__p7_2[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u0__p7_2 = {
-	_vq_quantthresh__44u0__p7_2,
-	_vq_quantmap__44u0__p7_2,
+static const encode_aux_threshmatch _vq_auxt__44u0__p7_2 = {
+	(float *)_vq_quantthresh__44u0__p7_2,
+	(long *)_vq_quantmap__44u0__p7_2,
 	13,
 	13
 };
 
-static static_codebook _44u0__p7_2 = {
+static const static_codebook _44u0__p7_2 = {
 	2, 169,
-	_vq_lengthlist__44u0__p7_2,
+	(long *)_vq_lengthlist__44u0__p7_2,
 	1, -531103744, 1611661312, 4, 0,
-	_vq_quantlist__44u0__p7_2,
+	(long *)_vq_quantlist__44u0__p7_2,
 	NULL,
-	&_vq_auxt__44u0__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u0__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u0__short[] = {
+static const long _huff_lengthlist__44u0__short[] = {
 	12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16,
 	 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16,
 	 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16,
 	11, 7, 3, 6, 4, 5, 8,16,12, 9, 4, 8, 5, 7, 9,16,
 };
 
-static static_codebook _huff_book__44u0__short = {
+static const static_codebook _huff_book__44u0__short = {
 	2, 64,
-	_huff_lengthlist__44u0__short,
+	(long *)_huff_lengthlist__44u0__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -4297,16 +4297,16 @@
 	0
 };
 
-static long _huff_lengthlist__44u1__long[] = {
+static const long _huff_lengthlist__44u1__long[] = {
 	 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16,
 	13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18,
 	15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17,
 	 9, 8,10, 8,10, 5, 4,11,12,17,19,14,16,10, 7,12,
 };
 
-static static_codebook _huff_book__44u1__long = {
+static const static_codebook _huff_book__44u1__long = {
 	2, 64,
-	_huff_lengthlist__44u1__long,
+	(long *)_huff_lengthlist__44u1__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -4315,13 +4315,13 @@
 	0
 };
 
-static long _vq_quantlist__44u1__p1_0[] = {
+static const long _vq_quantlist__44u1__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u1__p1_0[] = {
+static const long _vq_lengthlist__44u1__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8,
 	10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11,
 	11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11,
@@ -4330,39 +4330,39 @@
 	13,
 };
 
-static float _vq_quantthresh__44u1__p1_0[] = {
+static const float _vq_quantthresh__44u1__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u1__p1_0[] = {
+static const long _vq_quantmap__44u1__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p1_0 = {
-	_vq_quantthresh__44u1__p1_0,
-	_vq_quantmap__44u1__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p1_0 = {
+	(float *)_vq_quantthresh__44u1__p1_0,
+	(long *)_vq_quantmap__44u1__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u1__p1_0 = {
+static const static_codebook _44u1__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u1__p1_0,
+	(long *)_vq_lengthlist__44u1__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u1__p1_0,
+	(long *)_vq_quantlist__44u1__p1_0,
 	NULL,
-	&_vq_auxt__44u1__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p2_0[] = {
+static const long _vq_quantlist__44u1__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u1__p2_0[] = {
+static const long _vq_lengthlist__44u1__p2_0[] = {
 	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6,
 	 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8,
 	 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8,
@@ -4371,33 +4371,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u1__p2_0[] = {
+static const float _vq_quantthresh__44u1__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u1__p2_0[] = {
+static const long _vq_quantmap__44u1__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p2_0 = {
-	_vq_quantthresh__44u1__p2_0,
-	_vq_quantmap__44u1__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p2_0 = {
+	(float *)_vq_quantthresh__44u1__p2_0,
+	(long *)_vq_quantmap__44u1__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u1__p2_0 = {
+static const static_codebook _44u1__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u1__p2_0,
+	(long *)_vq_lengthlist__44u1__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u1__p2_0,
+	(long *)_vq_quantlist__44u1__p2_0,
 	NULL,
-	&_vq_auxt__44u1__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p3_0[] = {
+static const long _vq_quantlist__44u1__p3_0[] = {
 	2,
 	1,
 	3,
@@ -4405,7 +4405,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u1__p3_0[] = {
+static const long _vq_lengthlist__44u1__p3_0[] = {
 	 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9,
 	10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10,
 	10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11,
@@ -4448,33 +4448,33 @@
 	19,
 };
 
-static float _vq_quantthresh__44u1__p3_0[] = {
+static const float _vq_quantthresh__44u1__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u1__p3_0[] = {
+static const long _vq_quantmap__44u1__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p3_0 = {
-	_vq_quantthresh__44u1__p3_0,
-	_vq_quantmap__44u1__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p3_0 = {
+	(float *)_vq_quantthresh__44u1__p3_0,
+	(long *)_vq_quantmap__44u1__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u1__p3_0 = {
+static const static_codebook _44u1__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u1__p3_0,
+	(long *)_vq_lengthlist__44u1__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u1__p3_0,
+	(long *)_vq_quantlist__44u1__p3_0,
 	NULL,
-	&_vq_auxt__44u1__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p4_0[] = {
+static const long _vq_quantlist__44u1__p4_0[] = {
 	2,
 	1,
 	3,
@@ -4482,7 +4482,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u1__p4_0[] = {
+static const long _vq_lengthlist__44u1__p4_0[] = {
 	 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9,
 	10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7,
 	 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10,
@@ -4525,33 +4525,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44u1__p4_0[] = {
+static const float _vq_quantthresh__44u1__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u1__p4_0[] = {
+static const long _vq_quantmap__44u1__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p4_0 = {
-	_vq_quantthresh__44u1__p4_0,
-	_vq_quantmap__44u1__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p4_0 = {
+	(float *)_vq_quantthresh__44u1__p4_0,
+	(long *)_vq_quantmap__44u1__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u1__p4_0 = {
+static const static_codebook _44u1__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u1__p4_0,
+	(long *)_vq_lengthlist__44u1__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u1__p4_0,
+	(long *)_vq_quantlist__44u1__p4_0,
 	NULL,
-	&_vq_auxt__44u1__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p5_0[] = {
+static const long _vq_quantlist__44u1__p5_0[] = {
 	4,
 	3,
 	5,
@@ -4563,7 +4563,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u1__p5_0[] = {
+static const long _vq_lengthlist__44u1__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,10, 7, 8, 8,
@@ -4572,34 +4572,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44u1__p5_0[] = {
+static const float _vq_quantthresh__44u1__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u1__p5_0[] = {
+static const long _vq_quantmap__44u1__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p5_0 = {
-	_vq_quantthresh__44u1__p5_0,
-	_vq_quantmap__44u1__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p5_0 = {
+	(float *)_vq_quantthresh__44u1__p5_0,
+	(long *)_vq_quantmap__44u1__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u1__p5_0 = {
+static const static_codebook _44u1__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u1__p5_0,
+	(long *)_vq_lengthlist__44u1__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u1__p5_0,
+	(long *)_vq_quantlist__44u1__p5_0,
 	NULL,
-	&_vq_auxt__44u1__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p6_0[] = {
+static const long _vq_quantlist__44u1__p6_0[] = {
 	6,
 	5,
 	7,
@@ -4615,7 +4615,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u1__p6_0[] = {
+static const long _vq_lengthlist__44u1__p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5,
 	 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9,
 	 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11,
@@ -4629,35 +4629,35 @@
 	15,17,16,17,18,17,17,18, 0,
 };
 
-static float _vq_quantthresh__44u1__p6_0[] = {
+static const float _vq_quantthresh__44u1__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__44u1__p6_0[] = {
+static const long _vq_quantmap__44u1__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p6_0 = {
-	_vq_quantthresh__44u1__p6_0,
-	_vq_quantmap__44u1__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p6_0 = {
+	(float *)_vq_quantthresh__44u1__p6_0,
+	(long *)_vq_quantmap__44u1__p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u1__p6_0 = {
+static const static_codebook _44u1__p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u1__p6_0,
+	(long *)_vq_lengthlist__44u1__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u1__p6_0,
+	(long *)_vq_quantlist__44u1__p6_0,
 	NULL,
-	&_vq_auxt__44u1__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p6_1[] = {
+static const long _vq_quantlist__44u1__p6_1[] = {
 	2,
 	1,
 	3,
@@ -4665,38 +4665,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u1__p6_1[] = {
+static const long _vq_lengthlist__44u1__p6_1[] = {
 	 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5,
 	 6, 6, 6, 6, 5, 6, 6, 6, 6,
 };
 
-static float _vq_quantthresh__44u1__p6_1[] = {
+static const float _vq_quantthresh__44u1__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u1__p6_1[] = {
+static const long _vq_quantmap__44u1__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p6_1 = {
-	_vq_quantthresh__44u1__p6_1,
-	_vq_quantmap__44u1__p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u1__p6_1 = {
+	(float *)_vq_quantthresh__44u1__p6_1,
+	(long *)_vq_quantmap__44u1__p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u1__p6_1 = {
+static const static_codebook _44u1__p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u1__p6_1,
+	(long *)_vq_lengthlist__44u1__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u1__p6_1,
+	(long *)_vq_quantlist__44u1__p6_1,
 	NULL,
-	&_vq_auxt__44u1__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p7_0[] = {
+static const long _vq_quantlist__44u1__p7_0[] = {
 	3,
 	2,
 	4,
@@ -4706,40 +4706,40 @@
 	6,
 };
 
-static long _vq_lengthlist__44u1__p7_0[] = {
+static const long _vq_lengthlist__44u1__p7_0[] = {
 	 1, 3, 2, 9, 9, 7, 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, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8,
 };
 
-static float _vq_quantthresh__44u1__p7_0[] = {
+static const float _vq_quantthresh__44u1__p7_0[] = {
 	-422.5, -253.5, -84.5, 84.5, 253.5, 422.5, 
 };
 
-static long _vq_quantmap__44u1__p7_0[] = {
+static const long _vq_quantmap__44u1__p7_0[] = {
 	    5,    3,    1,    0,    2,    4,    6,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p7_0 = {
-	_vq_quantthresh__44u1__p7_0,
-	_vq_quantmap__44u1__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u1__p7_0 = {
+	(float *)_vq_quantthresh__44u1__p7_0,
+	(long *)_vq_quantmap__44u1__p7_0,
 	7,
 	7
 };
 
-static static_codebook _44u1__p7_0 = {
+static const static_codebook _44u1__p7_0 = {
 	2, 49,
-	_vq_lengthlist__44u1__p7_0,
+	(long *)_vq_lengthlist__44u1__p7_0,
 	1, -518017024, 1626677248, 3, 0,
-	_vq_quantlist__44u1__p7_0,
+	(long *)_vq_quantlist__44u1__p7_0,
 	NULL,
-	&_vq_auxt__44u1__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p7_1[] = {
+static const long _vq_quantlist__44u1__p7_1[] = {
 	6,
 	5,
 	7,
@@ -4755,7 +4755,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u1__p7_1[] = {
+static const long _vq_lengthlist__44u1__p7_1[] = {
 	 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7,
 	 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7,
 	 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10,
@@ -4769,35 +4769,35 @@
 	15,15,15,15,15,15,15,15,15,
 };
 
-static float _vq_quantthresh__44u1__p7_1[] = {
+static const float _vq_quantthresh__44u1__p7_1[] = {
 	-71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, 
 	32.5, 45.5, 58.5, 71.5, 
 };
 
-static long _vq_quantmap__44u1__p7_1[] = {
+static const long _vq_quantmap__44u1__p7_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p7_1 = {
-	_vq_quantthresh__44u1__p7_1,
-	_vq_quantmap__44u1__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u1__p7_1 = {
+	(float *)_vq_quantthresh__44u1__p7_1,
+	(long *)_vq_quantmap__44u1__p7_1,
 	13,
 	13
 };
 
-static static_codebook _44u1__p7_1 = {
+static const static_codebook _44u1__p7_1 = {
 	2, 169,
-	_vq_lengthlist__44u1__p7_1,
+	(long *)_vq_lengthlist__44u1__p7_1,
 	1, -523010048, 1618608128, 4, 0,
-	_vq_quantlist__44u1__p7_1,
+	(long *)_vq_quantlist__44u1__p7_1,
 	NULL,
-	&_vq_auxt__44u1__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u1__p7_2[] = {
+static const long _vq_quantlist__44u1__p7_2[] = {
 	6,
 	5,
 	7,
@@ -4813,7 +4813,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u1__p7_2[] = {
+static const long _vq_lengthlist__44u1__p7_2[] = {
 	 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6,
 	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8,
 	 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8,
@@ -4827,44 +4827,44 @@
 	 9, 9, 9,10, 9, 9,10,10, 9,
 };
 
-static float _vq_quantthresh__44u1__p7_2[] = {
+static const float _vq_quantthresh__44u1__p7_2[] = {
 	-5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 
 	2.5, 3.5, 4.5, 5.5, 
 };
 
-static long _vq_quantmap__44u1__p7_2[] = {
+static const long _vq_quantmap__44u1__p7_2[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u1__p7_2 = {
-	_vq_quantthresh__44u1__p7_2,
-	_vq_quantmap__44u1__p7_2,
+static const encode_aux_threshmatch _vq_auxt__44u1__p7_2 = {
+	(float *)_vq_quantthresh__44u1__p7_2,
+	(long *)_vq_quantmap__44u1__p7_2,
 	13,
 	13
 };
 
-static static_codebook _44u1__p7_2 = {
+static const static_codebook _44u1__p7_2 = {
 	2, 169,
-	_vq_lengthlist__44u1__p7_2,
+	(long *)_vq_lengthlist__44u1__p7_2,
 	1, -531103744, 1611661312, 4, 0,
-	_vq_quantlist__44u1__p7_2,
+	(long *)_vq_quantlist__44u1__p7_2,
 	NULL,
-	&_vq_auxt__44u1__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u1__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u1__short[] = {
+static const long _huff_lengthlist__44u1__short[] = {
 	12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16,
 	 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16,
 	 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16,
 	11, 7, 3, 6, 4, 5, 8,16,12, 9, 4, 8, 5, 7, 9,16,
 };
 
-static static_codebook _huff_book__44u1__short = {
+static const static_codebook _huff_book__44u1__short = {
 	2, 64,
-	_huff_lengthlist__44u1__short,
+	(long *)_huff_lengthlist__44u1__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -4873,16 +4873,16 @@
 	0
 };
 
-static long _huff_lengthlist__44u2__long[] = {
+static const long _huff_lengthlist__44u2__long[] = {
 	 5, 9,14,12,15,13,10,13, 7, 4, 5, 6, 8, 7, 8,12,
 	13, 4, 3, 5, 5, 6, 9,15,12, 6, 5, 6, 6, 6, 7,14,
 	14, 7, 4, 6, 4, 6, 8,15,12, 6, 6, 5, 5, 5, 6,14,
 	 9, 7, 8, 6, 7, 5, 4,10,10,13,14,14,15,10, 6, 8,
 };
 
-static static_codebook _huff_book__44u2__long = {
+static const static_codebook _huff_book__44u2__long = {
 	2, 64,
-	_huff_lengthlist__44u2__long,
+	(long *)_huff_lengthlist__44u2__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -4891,13 +4891,13 @@
 	0
 };
 
-static long _vq_quantlist__44u2__p1_0[] = {
+static const long _vq_quantlist__44u2__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u2__p1_0[] = {
+static const long _vq_lengthlist__44u2__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8,
 	10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11,
 	11, 8,11,11, 8,11,11,11,13,14,11,13,13, 7,11,11,
@@ -4906,39 +4906,39 @@
 	13,
 };
 
-static float _vq_quantthresh__44u2__p1_0[] = {
+static const float _vq_quantthresh__44u2__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u2__p1_0[] = {
+static const long _vq_quantmap__44u2__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p1_0 = {
-	_vq_quantthresh__44u2__p1_0,
-	_vq_quantmap__44u2__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p1_0 = {
+	(float *)_vq_quantthresh__44u2__p1_0,
+	(long *)_vq_quantmap__44u2__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u2__p1_0 = {
+static const static_codebook _44u2__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u2__p1_0,
+	(long *)_vq_lengthlist__44u2__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u2__p1_0,
+	(long *)_vq_quantlist__44u2__p1_0,
 	NULL,
-	&_vq_auxt__44u2__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p2_0[] = {
+static const long _vq_quantlist__44u2__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u2__p2_0[] = {
+static const long _vq_lengthlist__44u2__p2_0[] = {
 	 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6,
 	 8, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8,
 	 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8,
@@ -4947,33 +4947,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u2__p2_0[] = {
+static const float _vq_quantthresh__44u2__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u2__p2_0[] = {
+static const long _vq_quantmap__44u2__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p2_0 = {
-	_vq_quantthresh__44u2__p2_0,
-	_vq_quantmap__44u2__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p2_0 = {
+	(float *)_vq_quantthresh__44u2__p2_0,
+	(long *)_vq_quantmap__44u2__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u2__p2_0 = {
+static const static_codebook _44u2__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u2__p2_0,
+	(long *)_vq_lengthlist__44u2__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u2__p2_0,
+	(long *)_vq_quantlist__44u2__p2_0,
 	NULL,
-	&_vq_auxt__44u2__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p3_0[] = {
+static const long _vq_quantlist__44u2__p3_0[] = {
 	2,
 	1,
 	3,
@@ -4981,7 +4981,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u2__p3_0[] = {
+static const long _vq_lengthlist__44u2__p3_0[] = {
 	 2, 4, 4, 7, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
 	 9, 9,12,11, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9,
 	 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11,
@@ -5024,33 +5024,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44u2__p3_0[] = {
+static const float _vq_quantthresh__44u2__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u2__p3_0[] = {
+static const long _vq_quantmap__44u2__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p3_0 = {
-	_vq_quantthresh__44u2__p3_0,
-	_vq_quantmap__44u2__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p3_0 = {
+	(float *)_vq_quantthresh__44u2__p3_0,
+	(long *)_vq_quantmap__44u2__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u2__p3_0 = {
+static const static_codebook _44u2__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u2__p3_0,
+	(long *)_vq_lengthlist__44u2__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u2__p3_0,
+	(long *)_vq_quantlist__44u2__p3_0,
 	NULL,
-	&_vq_auxt__44u2__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p4_0[] = {
+static const long _vq_quantlist__44u2__p4_0[] = {
 	2,
 	1,
 	3,
@@ -5058,7 +5058,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u2__p4_0[] = {
+static const long _vq_lengthlist__44u2__p4_0[] = {
 	 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9,
 	 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10,
@@ -5101,33 +5101,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44u2__p4_0[] = {
+static const float _vq_quantthresh__44u2__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u2__p4_0[] = {
+static const long _vq_quantmap__44u2__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p4_0 = {
-	_vq_quantthresh__44u2__p4_0,
-	_vq_quantmap__44u2__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p4_0 = {
+	(float *)_vq_quantthresh__44u2__p4_0,
+	(long *)_vq_quantmap__44u2__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u2__p4_0 = {
+static const static_codebook _44u2__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u2__p4_0,
+	(long *)_vq_lengthlist__44u2__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u2__p4_0,
+	(long *)_vq_quantlist__44u2__p4_0,
 	NULL,
-	&_vq_auxt__44u2__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p5_0[] = {
+static const long _vq_quantlist__44u2__p5_0[] = {
 	4,
 	3,
 	5,
@@ -5139,7 +5139,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u2__p5_0[] = {
+static const long _vq_lengthlist__44u2__p5_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 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, 8, 8, 8,
@@ -5148,34 +5148,34 @@
 	13,
 };
 
-static float _vq_quantthresh__44u2__p5_0[] = {
+static const float _vq_quantthresh__44u2__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u2__p5_0[] = {
+static const long _vq_quantmap__44u2__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p5_0 = {
-	_vq_quantthresh__44u2__p5_0,
-	_vq_quantmap__44u2__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p5_0 = {
+	(float *)_vq_quantthresh__44u2__p5_0,
+	(long *)_vq_quantmap__44u2__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u2__p5_0 = {
+static const static_codebook _44u2__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u2__p5_0,
+	(long *)_vq_lengthlist__44u2__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u2__p5_0,
+	(long *)_vq_quantlist__44u2__p5_0,
 	NULL,
-	&_vq_auxt__44u2__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p6_0[] = {
+static const long _vq_quantlist__44u2__p6_0[] = {
 	6,
 	5,
 	7,
@@ -5191,7 +5191,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u2__p6_0[] = {
+static const long _vq_lengthlist__44u2__p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8,10,10,11,11,14,13, 4, 6, 5,
 	 8, 8, 9, 9,11,10,12,11,15,14, 4, 5, 6, 8, 8, 9,
 	 9,11,11,11,11,14,14, 6, 8, 8,10, 9,11,11,11,11,
@@ -5205,35 +5205,35 @@
 	15,17,17,16,18,17,18, 0, 0,
 };
 
-static float _vq_quantthresh__44u2__p6_0[] = {
+static const float _vq_quantthresh__44u2__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__44u2__p6_0[] = {
+static const long _vq_quantmap__44u2__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p6_0 = {
-	_vq_quantthresh__44u2__p6_0,
-	_vq_quantmap__44u2__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p6_0 = {
+	(float *)_vq_quantthresh__44u2__p6_0,
+	(long *)_vq_quantmap__44u2__p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u2__p6_0 = {
+static const static_codebook _44u2__p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u2__p6_0,
+	(long *)_vq_lengthlist__44u2__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u2__p6_0,
+	(long *)_vq_quantlist__44u2__p6_0,
 	NULL,
-	&_vq_auxt__44u2__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p6_1[] = {
+static const long _vq_quantlist__44u2__p6_1[] = {
 	2,
 	1,
 	3,
@@ -5241,38 +5241,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u2__p6_1[] = {
+static const long _vq_lengthlist__44u2__p6_1[] = {
 	 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5,
 	 6, 5, 6, 6, 5, 5, 6, 6, 6,
 };
 
-static float _vq_quantthresh__44u2__p6_1[] = {
+static const float _vq_quantthresh__44u2__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u2__p6_1[] = {
+static const long _vq_quantmap__44u2__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p6_1 = {
-	_vq_quantthresh__44u2__p6_1,
-	_vq_quantmap__44u2__p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u2__p6_1 = {
+	(float *)_vq_quantthresh__44u2__p6_1,
+	(long *)_vq_quantmap__44u2__p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u2__p6_1 = {
+static const static_codebook _44u2__p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u2__p6_1,
+	(long *)_vq_lengthlist__44u2__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u2__p6_1,
+	(long *)_vq_quantlist__44u2__p6_1,
 	NULL,
-	&_vq_auxt__44u2__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p7_0[] = {
+static const long _vq_quantlist__44u2__p7_0[] = {
 	4,
 	3,
 	5,
@@ -5284,7 +5284,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u2__p7_0[] = {
+static const long _vq_lengthlist__44u2__p7_0[] = {
 	 1, 3, 2,12,12,12,12,12,12, 4,12,12,12,12,12,12,
 	12,12, 5,12,12,12,12,12,12,12,12,12,12,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -5293,34 +5293,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44u2__p7_0[] = {
+static const float _vq_quantthresh__44u2__p7_0[] = {
 	-591.5, -422.5, -253.5, -84.5, 84.5, 253.5, 422.5, 591.5, 
 };
 
-static long _vq_quantmap__44u2__p7_0[] = {
+static const long _vq_quantmap__44u2__p7_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p7_0 = {
-	_vq_quantthresh__44u2__p7_0,
-	_vq_quantmap__44u2__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u2__p7_0 = {
+	(float *)_vq_quantthresh__44u2__p7_0,
+	(long *)_vq_quantmap__44u2__p7_0,
 	9,
 	9
 };
 
-static static_codebook _44u2__p7_0 = {
+static const static_codebook _44u2__p7_0 = {
 	2, 81,
-	_vq_lengthlist__44u2__p7_0,
+	(long *)_vq_lengthlist__44u2__p7_0,
 	1, -516612096, 1626677248, 4, 0,
-	_vq_quantlist__44u2__p7_0,
+	(long *)_vq_quantlist__44u2__p7_0,
 	NULL,
-	&_vq_auxt__44u2__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p7_1[] = {
+static const long _vq_quantlist__44u2__p7_1[] = {
 	6,
 	5,
 	7,
@@ -5336,7 +5336,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u2__p7_1[] = {
+static const long _vq_lengthlist__44u2__p7_1[] = {
 	 1, 4, 4, 7, 6, 7, 6, 8, 7, 9, 7, 9, 8, 4, 7, 6,
 	 8, 8, 9, 8,10, 9,10,10,11,11, 4, 7, 7, 8, 8, 8,
 	 8, 9,10,11,11,11,11, 6, 8, 8,10,10,10,10,11,11,
@@ -5350,35 +5350,35 @@
 	14,14,14,17,15,17,17,17,17,
 };
 
-static float _vq_quantthresh__44u2__p7_1[] = {
+static const float _vq_quantthresh__44u2__p7_1[] = {
 	-71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, 
 	32.5, 45.5, 58.5, 71.5, 
 };
 
-static long _vq_quantmap__44u2__p7_1[] = {
+static const long _vq_quantmap__44u2__p7_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p7_1 = {
-	_vq_quantthresh__44u2__p7_1,
-	_vq_quantmap__44u2__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u2__p7_1 = {
+	(float *)_vq_quantthresh__44u2__p7_1,
+	(long *)_vq_quantmap__44u2__p7_1,
 	13,
 	13
 };
 
-static static_codebook _44u2__p7_1 = {
+static const static_codebook _44u2__p7_1 = {
 	2, 169,
-	_vq_lengthlist__44u2__p7_1,
+	(long *)_vq_lengthlist__44u2__p7_1,
 	1, -523010048, 1618608128, 4, 0,
-	_vq_quantlist__44u2__p7_1,
+	(long *)_vq_quantlist__44u2__p7_1,
 	NULL,
-	&_vq_auxt__44u2__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u2__p7_2[] = {
+static const long _vq_quantlist__44u2__p7_2[] = {
 	6,
 	5,
 	7,
@@ -5394,7 +5394,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u2__p7_2[] = {
+static const long _vq_lengthlist__44u2__p7_2[] = {
 	 2, 5, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 5, 6, 6, 7, 7, 8,
 	 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 8, 8, 8, 8, 8,
@@ -5408,44 +5408,44 @@
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__44u2__p7_2[] = {
+static const float _vq_quantthresh__44u2__p7_2[] = {
 	-5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 
 	2.5, 3.5, 4.5, 5.5, 
 };
 
-static long _vq_quantmap__44u2__p7_2[] = {
+static const long _vq_quantmap__44u2__p7_2[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u2__p7_2 = {
-	_vq_quantthresh__44u2__p7_2,
-	_vq_quantmap__44u2__p7_2,
+static const encode_aux_threshmatch _vq_auxt__44u2__p7_2 = {
+	(float *)_vq_quantthresh__44u2__p7_2,
+	(long *)_vq_quantmap__44u2__p7_2,
 	13,
 	13
 };
 
-static static_codebook _44u2__p7_2 = {
+static const static_codebook _44u2__p7_2 = {
 	2, 169,
-	_vq_lengthlist__44u2__p7_2,
+	(long *)_vq_lengthlist__44u2__p7_2,
 	1, -531103744, 1611661312, 4, 0,
-	_vq_quantlist__44u2__p7_2,
+	(long *)_vq_quantlist__44u2__p7_2,
 	NULL,
-	&_vq_auxt__44u2__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u2__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u2__short[] = {
+static const long _huff_lengthlist__44u2__short[] = {
 	13,15,17,17,15,15,12,17,11, 9, 7,10,10, 9,12,17,
 	10, 6, 3, 6, 5, 7,10,17,15,10, 6, 9, 8, 9,11,17,
 	15, 8, 4, 7, 3, 5, 9,16,16,10, 5, 8, 4, 5, 8,16,
 	13,11, 5, 8, 3, 3, 5,14,13,12, 7,10, 5, 5, 7,14,
 };
 
-static static_codebook _huff_book__44u2__short = {
+static const static_codebook _huff_book__44u2__short = {
 	2, 64,
-	_huff_lengthlist__44u2__short,
+	(long *)_huff_lengthlist__44u2__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -5454,16 +5454,16 @@
 	0
 };
 
-static long _huff_lengthlist__44u3__long[] = {
+static const long _huff_lengthlist__44u3__long[] = {
 	 6, 9,13,12,14,11,10,13, 8, 4, 5, 7, 8, 7, 8,12,
 	11, 4, 3, 5, 5, 7, 9,14,11, 6, 5, 6, 6, 6, 7,13,
 	13, 7, 5, 6, 4, 5, 7,14,11, 7, 6, 6, 5, 5, 6,13,
 	 9, 7, 8, 6, 7, 5, 3, 9, 9,12,13,12,14,10, 6, 7,
 };
 
-static static_codebook _huff_book__44u3__long = {
+static const static_codebook _huff_book__44u3__long = {
 	2, 64,
-	_huff_lengthlist__44u3__long,
+	(long *)_huff_lengthlist__44u3__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -5472,13 +5472,13 @@
 	0
 };
 
-static long _vq_quantlist__44u3__p1_0[] = {
+static const long _vq_quantlist__44u3__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u3__p1_0[] = {
+static const long _vq_lengthlist__44u3__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8,
 	10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11,
 	11, 8,11,11, 8,11,11,11,13,14,11,14,14, 8,11,11,
@@ -5487,39 +5487,39 @@
 	13,
 };
 
-static float _vq_quantthresh__44u3__p1_0[] = {
+static const float _vq_quantthresh__44u3__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u3__p1_0[] = {
+static const long _vq_quantmap__44u3__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p1_0 = {
-	_vq_quantthresh__44u3__p1_0,
-	_vq_quantmap__44u3__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p1_0 = {
+	(float *)_vq_quantthresh__44u3__p1_0,
+	(long *)_vq_quantmap__44u3__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u3__p1_0 = {
+static const static_codebook _44u3__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u3__p1_0,
+	(long *)_vq_lengthlist__44u3__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u3__p1_0,
+	(long *)_vq_quantlist__44u3__p1_0,
 	NULL,
-	&_vq_auxt__44u3__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p2_0[] = {
+static const long _vq_quantlist__44u3__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u3__p2_0[] = {
+static const long _vq_lengthlist__44u3__p2_0[] = {
 	 2, 5, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6,
 	 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 7, 8,
 	 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8,
@@ -5528,33 +5528,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u3__p2_0[] = {
+static const float _vq_quantthresh__44u3__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u3__p2_0[] = {
+static const long _vq_quantmap__44u3__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p2_0 = {
-	_vq_quantthresh__44u3__p2_0,
-	_vq_quantmap__44u3__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p2_0 = {
+	(float *)_vq_quantthresh__44u3__p2_0,
+	(long *)_vq_quantmap__44u3__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u3__p2_0 = {
+static const static_codebook _44u3__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u3__p2_0,
+	(long *)_vq_lengthlist__44u3__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u3__p2_0,
+	(long *)_vq_quantlist__44u3__p2_0,
 	NULL,
-	&_vq_auxt__44u3__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p3_0[] = {
+static const long _vq_quantlist__44u3__p3_0[] = {
 	2,
 	1,
 	3,
@@ -5562,7 +5562,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u3__p3_0[] = {
+static const long _vq_lengthlist__44u3__p3_0[] = {
 	 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
 	 9, 9,12,12, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9,
 	 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11,
@@ -5605,33 +5605,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44u3__p3_0[] = {
+static const float _vq_quantthresh__44u3__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u3__p3_0[] = {
+static const long _vq_quantmap__44u3__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p3_0 = {
-	_vq_quantthresh__44u3__p3_0,
-	_vq_quantmap__44u3__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p3_0 = {
+	(float *)_vq_quantthresh__44u3__p3_0,
+	(long *)_vq_quantmap__44u3__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u3__p3_0 = {
+static const static_codebook _44u3__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u3__p3_0,
+	(long *)_vq_lengthlist__44u3__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u3__p3_0,
+	(long *)_vq_quantlist__44u3__p3_0,
 	NULL,
-	&_vq_auxt__44u3__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p4_0[] = {
+static const long _vq_quantlist__44u3__p4_0[] = {
 	2,
 	1,
 	3,
@@ -5639,7 +5639,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u3__p4_0[] = {
+static const long _vq_lengthlist__44u3__p4_0[] = {
 	 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9,
 	 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10,
@@ -5682,33 +5682,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44u3__p4_0[] = {
+static const float _vq_quantthresh__44u3__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u3__p4_0[] = {
+static const long _vq_quantmap__44u3__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p4_0 = {
-	_vq_quantthresh__44u3__p4_0,
-	_vq_quantmap__44u3__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p4_0 = {
+	(float *)_vq_quantthresh__44u3__p4_0,
+	(long *)_vq_quantmap__44u3__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u3__p4_0 = {
+static const static_codebook _44u3__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u3__p4_0,
+	(long *)_vq_lengthlist__44u3__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u3__p4_0,
+	(long *)_vq_quantlist__44u3__p4_0,
 	NULL,
-	&_vq_auxt__44u3__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p5_0[] = {
+static const long _vq_quantlist__44u3__p5_0[] = {
 	4,
 	3,
 	5,
@@ -5720,7 +5720,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u3__p5_0[] = {
+static const long _vq_lengthlist__44u3__p5_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8,
 	10,10, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8,
 	 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,10, 7, 8, 8,
@@ -5729,34 +5729,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44u3__p5_0[] = {
+static const float _vq_quantthresh__44u3__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u3__p5_0[] = {
+static const long _vq_quantmap__44u3__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p5_0 = {
-	_vq_quantthresh__44u3__p5_0,
-	_vq_quantmap__44u3__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p5_0 = {
+	(float *)_vq_quantthresh__44u3__p5_0,
+	(long *)_vq_quantmap__44u3__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u3__p5_0 = {
+static const static_codebook _44u3__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u3__p5_0,
+	(long *)_vq_lengthlist__44u3__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u3__p5_0,
+	(long *)_vq_quantlist__44u3__p5_0,
 	NULL,
-	&_vq_auxt__44u3__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p6_0[] = {
+static const long _vq_quantlist__44u3__p6_0[] = {
 	6,
 	5,
 	7,
@@ -5772,7 +5772,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u3__p6_0[] = {
+static const long _vq_lengthlist__44u3__p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,13,14, 4, 6, 5,
 	 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9,
 	 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11,
@@ -5786,35 +5786,35 @@
 	15,16,16,16,17,18,16,20,18,
 };
 
-static float _vq_quantthresh__44u3__p6_0[] = {
+static const float _vq_quantthresh__44u3__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__44u3__p6_0[] = {
+static const long _vq_quantmap__44u3__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p6_0 = {
-	_vq_quantthresh__44u3__p6_0,
-	_vq_quantmap__44u3__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p6_0 = {
+	(float *)_vq_quantthresh__44u3__p6_0,
+	(long *)_vq_quantmap__44u3__p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u3__p6_0 = {
+static const static_codebook _44u3__p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u3__p6_0,
+	(long *)_vq_lengthlist__44u3__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u3__p6_0,
+	(long *)_vq_quantlist__44u3__p6_0,
 	NULL,
-	&_vq_auxt__44u3__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p6_1[] = {
+static const long _vq_quantlist__44u3__p6_1[] = {
 	2,
 	1,
 	3,
@@ -5822,38 +5822,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u3__p6_1[] = {
+static const long _vq_lengthlist__44u3__p6_1[] = {
 	 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5,
 	 6, 5, 6, 6, 5, 5, 6, 6, 6,
 };
 
-static float _vq_quantthresh__44u3__p6_1[] = {
+static const float _vq_quantthresh__44u3__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u3__p6_1[] = {
+static const long _vq_quantmap__44u3__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p6_1 = {
-	_vq_quantthresh__44u3__p6_1,
-	_vq_quantmap__44u3__p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u3__p6_1 = {
+	(float *)_vq_quantthresh__44u3__p6_1,
+	(long *)_vq_quantmap__44u3__p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u3__p6_1 = {
+static const static_codebook _44u3__p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u3__p6_1,
+	(long *)_vq_lengthlist__44u3__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u3__p6_1,
+	(long *)_vq_quantlist__44u3__p6_1,
 	NULL,
-	&_vq_auxt__44u3__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p7_0[] = {
+static const long _vq_quantlist__44u3__p7_0[] = {
 	4,
 	3,
 	5,
@@ -5865,7 +5865,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u3__p7_0[] = {
+static const long _vq_lengthlist__44u3__p7_0[] = {
 	 1, 3, 3,10,10,10,10,10,10, 4,10,10,10,10,10,10,
 	10,10, 4,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
@@ -5874,34 +5874,34 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u3__p7_0[] = {
+static const float _vq_quantthresh__44u3__p7_0[] = {
 	-892.5, -637.5, -382.5, -127.5, 127.5, 382.5, 637.5, 892.5, 
 };
 
-static long _vq_quantmap__44u3__p7_0[] = {
+static const long _vq_quantmap__44u3__p7_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p7_0 = {
-	_vq_quantthresh__44u3__p7_0,
-	_vq_quantmap__44u3__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u3__p7_0 = {
+	(float *)_vq_quantthresh__44u3__p7_0,
+	(long *)_vq_quantmap__44u3__p7_0,
 	9,
 	9
 };
 
-static static_codebook _44u3__p7_0 = {
+static const static_codebook _44u3__p7_0 = {
 	2, 81,
-	_vq_lengthlist__44u3__p7_0,
+	(long *)_vq_lengthlist__44u3__p7_0,
 	1, -515907584, 1627381760, 4, 0,
-	_vq_quantlist__44u3__p7_0,
+	(long *)_vq_quantlist__44u3__p7_0,
 	NULL,
-	&_vq_auxt__44u3__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p7_1[] = {
+static const long _vq_quantlist__44u3__p7_1[] = {
 	7,
 	6,
 	8,
@@ -5919,7 +5919,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u3__p7_1[] = {
+static const long _vq_lengthlist__44u3__p7_1[] = {
 	 1, 4, 4, 6, 6, 7, 6, 8, 7, 9, 8,10, 9,11,11, 4,
 	 7, 7, 8, 7, 9, 9,10,10,11,11,11,11,12,12, 4, 7,
 	 7, 7, 7, 9, 9,10,10,11,11,12,12,12,11, 6, 8, 8,
@@ -5937,35 +5937,35 @@
 	17,
 };
 
-static float _vq_quantthresh__44u3__p7_1[] = {
+static const float _vq_quantthresh__44u3__p7_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__44u3__p7_1[] = {
+static const long _vq_quantmap__44u3__p7_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p7_1 = {
-	_vq_quantthresh__44u3__p7_1,
-	_vq_quantmap__44u3__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u3__p7_1 = {
+	(float *)_vq_quantthresh__44u3__p7_1,
+	(long *)_vq_quantmap__44u3__p7_1,
 	15,
 	15
 };
 
-static static_codebook _44u3__p7_1 = {
+static const static_codebook _44u3__p7_1 = {
 	2, 225,
-	_vq_lengthlist__44u3__p7_1,
+	(long *)_vq_lengthlist__44u3__p7_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__44u3__p7_1,
+	(long *)_vq_quantlist__44u3__p7_1,
 	NULL,
-	&_vq_auxt__44u3__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u3__p7_2[] = {
+static const long _vq_quantlist__44u3__p7_2[] = {
 	8,
 	7,
 	9,
@@ -5985,7 +5985,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44u3__p7_2[] = {
+static const long _vq_lengthlist__44u3__p7_2[] = {
 	 2, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
 	10,10, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9,
@@ -6007,45 +6007,45 @@
 	11,
 };
 
-static float _vq_quantthresh__44u3__p7_2[] = {
+static const float _vq_quantthresh__44u3__p7_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__44u3__p7_2[] = {
+static const long _vq_quantmap__44u3__p7_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u3__p7_2 = {
-	_vq_quantthresh__44u3__p7_2,
-	_vq_quantmap__44u3__p7_2,
+static const encode_aux_threshmatch _vq_auxt__44u3__p7_2 = {
+	(float *)_vq_quantthresh__44u3__p7_2,
+	(long *)_vq_quantmap__44u3__p7_2,
 	17,
 	17
 };
 
-static static_codebook _44u3__p7_2 = {
+static const static_codebook _44u3__p7_2 = {
 	2, 289,
-	_vq_lengthlist__44u3__p7_2,
+	(long *)_vq_lengthlist__44u3__p7_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44u3__p7_2,
+	(long *)_vq_quantlist__44u3__p7_2,
 	NULL,
-	&_vq_auxt__44u3__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u3__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u3__short[] = {
+static const long _huff_lengthlist__44u3__short[] = {
 	14,14,14,15,13,15,12,16,10, 8, 7, 9, 9, 8,12,16,
 	10, 5, 4, 6, 5, 6, 9,16,14, 8, 6, 8, 7, 8,10,16,
 	14, 7, 4, 6, 3, 5, 8,16,15, 9, 5, 7, 4, 4, 7,16,
 	13,10, 6, 7, 4, 3, 4,13,13,12, 7, 9, 5, 5, 6,12,
 };
 
-static static_codebook _huff_book__44u3__short = {
+static const static_codebook _huff_book__44u3__short = {
 	2, 64,
-	_huff_lengthlist__44u3__short,
+	(long *)_huff_lengthlist__44u3__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -6054,16 +6054,16 @@
 	0
 };
 
-static long _huff_lengthlist__44u4__long[] = {
+static const long _huff_lengthlist__44u4__long[] = {
 	 3, 8,12,12,13,12,11,13, 5, 4, 6, 7, 8, 8, 9,13,
 	 9, 5, 4, 5, 5, 7, 9,13, 9, 6, 5, 6, 6, 7, 8,12,
 	12, 7, 5, 6, 4, 5, 8,13,11, 7, 6, 6, 5, 5, 6,12,
 	10, 8, 8, 7, 7, 5, 3, 8,10,12,13,12,12, 9, 6, 7,
 };
 
-static static_codebook _huff_book__44u4__long = {
+static const static_codebook _huff_book__44u4__long = {
 	2, 64,
-	_huff_lengthlist__44u4__long,
+	(long *)_huff_lengthlist__44u4__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -6072,13 +6072,13 @@
 	0
 };
 
-static long _vq_quantlist__44u4__p1_0[] = {
+static const long _vq_quantlist__44u4__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u4__p1_0[] = {
+static const long _vq_lengthlist__44u4__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8,
 	10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11,
 	11, 8,11,11, 8,11,11,11,13,14,11,15,14, 8,11,11,
@@ -6087,39 +6087,39 @@
 	13,
 };
 
-static float _vq_quantthresh__44u4__p1_0[] = {
+static const float _vq_quantthresh__44u4__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u4__p1_0[] = {
+static const long _vq_quantmap__44u4__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p1_0 = {
-	_vq_quantthresh__44u4__p1_0,
-	_vq_quantmap__44u4__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p1_0 = {
+	(float *)_vq_quantthresh__44u4__p1_0,
+	(long *)_vq_quantmap__44u4__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u4__p1_0 = {
+static const static_codebook _44u4__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u4__p1_0,
+	(long *)_vq_lengthlist__44u4__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u4__p1_0,
+	(long *)_vq_quantlist__44u4__p1_0,
 	NULL,
-	&_vq_auxt__44u4__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p2_0[] = {
+static const long _vq_quantlist__44u4__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u4__p2_0[] = {
+static const long _vq_lengthlist__44u4__p2_0[] = {
 	 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6,
 	 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 6, 8,
 	 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8,
@@ -6128,33 +6128,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u4__p2_0[] = {
+static const float _vq_quantthresh__44u4__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u4__p2_0[] = {
+static const long _vq_quantmap__44u4__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p2_0 = {
-	_vq_quantthresh__44u4__p2_0,
-	_vq_quantmap__44u4__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p2_0 = {
+	(float *)_vq_quantthresh__44u4__p2_0,
+	(long *)_vq_quantmap__44u4__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u4__p2_0 = {
+static const static_codebook _44u4__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u4__p2_0,
+	(long *)_vq_lengthlist__44u4__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u4__p2_0,
+	(long *)_vq_quantlist__44u4__p2_0,
 	NULL,
-	&_vq_auxt__44u4__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p3_0[] = {
+static const long _vq_quantlist__44u4__p3_0[] = {
 	2,
 	1,
 	3,
@@ -6162,7 +6162,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u4__p3_0[] = {
+static const long _vq_lengthlist__44u4__p3_0[] = {
 	 2, 4, 4, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
 	10, 9,12,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9,
 	 9,11,11, 7, 9, 9,11,11,10,12,11,14,14, 9,10,11,
@@ -6205,33 +6205,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44u4__p3_0[] = {
+static const float _vq_quantthresh__44u4__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u4__p3_0[] = {
+static const long _vq_quantmap__44u4__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p3_0 = {
-	_vq_quantthresh__44u4__p3_0,
-	_vq_quantmap__44u4__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p3_0 = {
+	(float *)_vq_quantthresh__44u4__p3_0,
+	(long *)_vq_quantmap__44u4__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u4__p3_0 = {
+static const static_codebook _44u4__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u4__p3_0,
+	(long *)_vq_lengthlist__44u4__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u4__p3_0,
+	(long *)_vq_quantlist__44u4__p3_0,
 	NULL,
-	&_vq_auxt__44u4__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p4_0[] = {
+static const long _vq_quantlist__44u4__p4_0[] = {
 	2,
 	1,
 	3,
@@ -6239,7 +6239,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u4__p4_0[] = {
+static const long _vq_lengthlist__44u4__p4_0[] = {
 	 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9,
 	 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10,
@@ -6282,33 +6282,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44u4__p4_0[] = {
+static const float _vq_quantthresh__44u4__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u4__p4_0[] = {
+static const long _vq_quantmap__44u4__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p4_0 = {
-	_vq_quantthresh__44u4__p4_0,
-	_vq_quantmap__44u4__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p4_0 = {
+	(float *)_vq_quantthresh__44u4__p4_0,
+	(long *)_vq_quantmap__44u4__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u4__p4_0 = {
+static const static_codebook _44u4__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u4__p4_0,
+	(long *)_vq_lengthlist__44u4__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u4__p4_0,
+	(long *)_vq_quantlist__44u4__p4_0,
 	NULL,
-	&_vq_auxt__44u4__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p5_0[] = {
+static const long _vq_quantlist__44u4__p5_0[] = {
 	4,
 	3,
 	5,
@@ -6320,7 +6320,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u4__p5_0[] = {
+static const long _vq_lengthlist__44u4__p5_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8,
 	10, 9, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8,
 	 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,11, 7, 8, 8,
@@ -6329,34 +6329,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44u4__p5_0[] = {
+static const float _vq_quantthresh__44u4__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u4__p5_0[] = {
+static const long _vq_quantmap__44u4__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p5_0 = {
-	_vq_quantthresh__44u4__p5_0,
-	_vq_quantmap__44u4__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p5_0 = {
+	(float *)_vq_quantthresh__44u4__p5_0,
+	(long *)_vq_quantmap__44u4__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u4__p5_0 = {
+static const static_codebook _44u4__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u4__p5_0,
+	(long *)_vq_lengthlist__44u4__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u4__p5_0,
+	(long *)_vq_quantlist__44u4__p5_0,
 	NULL,
-	&_vq_auxt__44u4__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p6_0[] = {
+static const long _vq_quantlist__44u4__p6_0[] = {
 	6,
 	5,
 	7,
@@ -6372,7 +6372,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u4__p6_0[] = {
+static const long _vq_lengthlist__44u4__p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9, 9,11,10,13,13, 4, 6, 5,
 	 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9,
 	 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11,
@@ -6386,35 +6386,35 @@
 	16,16,16,17,17,18,17,20,21,
 };
 
-static float _vq_quantthresh__44u4__p6_0[] = {
+static const float _vq_quantthresh__44u4__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__44u4__p6_0[] = {
+static const long _vq_quantmap__44u4__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p6_0 = {
-	_vq_quantthresh__44u4__p6_0,
-	_vq_quantmap__44u4__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p6_0 = {
+	(float *)_vq_quantthresh__44u4__p6_0,
+	(long *)_vq_quantmap__44u4__p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u4__p6_0 = {
+static const static_codebook _44u4__p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u4__p6_0,
+	(long *)_vq_lengthlist__44u4__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u4__p6_0,
+	(long *)_vq_quantlist__44u4__p6_0,
 	NULL,
-	&_vq_auxt__44u4__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p6_1[] = {
+static const long _vq_quantlist__44u4__p6_1[] = {
 	2,
 	1,
 	3,
@@ -6422,38 +6422,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u4__p6_1[] = {
+static const long _vq_lengthlist__44u4__p6_1[] = {
 	 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5,
 	 6, 5, 6, 6, 5, 5, 6, 6, 6,
 };
 
-static float _vq_quantthresh__44u4__p6_1[] = {
+static const float _vq_quantthresh__44u4__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u4__p6_1[] = {
+static const long _vq_quantmap__44u4__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p6_1 = {
-	_vq_quantthresh__44u4__p6_1,
-	_vq_quantmap__44u4__p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u4__p6_1 = {
+	(float *)_vq_quantthresh__44u4__p6_1,
+	(long *)_vq_quantmap__44u4__p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u4__p6_1 = {
+static const static_codebook _44u4__p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u4__p6_1,
+	(long *)_vq_lengthlist__44u4__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u4__p6_1,
+	(long *)_vq_quantlist__44u4__p6_1,
 	NULL,
-	&_vq_auxt__44u4__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p7_0[] = {
+static const long _vq_quantlist__44u4__p7_0[] = {
 	6,
 	5,
 	7,
@@ -6469,7 +6469,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u4__p7_0[] = {
+static const long _vq_lengthlist__44u4__p7_0[] = {
 	 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 3,12,11,
 	12,12,12,12,12,12,12,12,12,12, 4,11,10,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@@ -6483,35 +6483,35 @@
 	11,11,11,11,11,11,11,11,11,
 };
 
-static float _vq_quantthresh__44u4__p7_0[] = {
+static const float _vq_quantthresh__44u4__p7_0[] = {
 	-1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, 
 	637.5, 892.5, 1147.5, 1402.5, 
 };
 
-static long _vq_quantmap__44u4__p7_0[] = {
+static const long _vq_quantmap__44u4__p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p7_0 = {
-	_vq_quantthresh__44u4__p7_0,
-	_vq_quantmap__44u4__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u4__p7_0 = {
+	(float *)_vq_quantthresh__44u4__p7_0,
+	(long *)_vq_quantmap__44u4__p7_0,
 	13,
 	13
 };
 
-static static_codebook _44u4__p7_0 = {
+static const static_codebook _44u4__p7_0 = {
 	2, 169,
-	_vq_lengthlist__44u4__p7_0,
+	(long *)_vq_lengthlist__44u4__p7_0,
 	1, -514332672, 1627381760, 4, 0,
-	_vq_quantlist__44u4__p7_0,
+	(long *)_vq_quantlist__44u4__p7_0,
 	NULL,
-	&_vq_auxt__44u4__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p7_1[] = {
+static const long _vq_quantlist__44u4__p7_1[] = {
 	7,
 	6,
 	8,
@@ -6529,7 +6529,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u4__p7_1[] = {
+static const long _vq_lengthlist__44u4__p7_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 9, 8,10, 8,10, 9,11,11, 4,
 	 7, 6, 8, 7, 9, 9,10,10,11,10,11,10,12,10, 4, 6,
 	 7, 8, 8, 9, 9,10,10,11,11,11,11,12,12, 6, 8, 8,
@@ -6547,35 +6547,35 @@
 	16,
 };
 
-static float _vq_quantthresh__44u4__p7_1[] = {
+static const float _vq_quantthresh__44u4__p7_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__44u4__p7_1[] = {
+static const long _vq_quantmap__44u4__p7_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p7_1 = {
-	_vq_quantthresh__44u4__p7_1,
-	_vq_quantmap__44u4__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u4__p7_1 = {
+	(float *)_vq_quantthresh__44u4__p7_1,
+	(long *)_vq_quantmap__44u4__p7_1,
 	15,
 	15
 };
 
-static static_codebook _44u4__p7_1 = {
+static const static_codebook _44u4__p7_1 = {
 	2, 225,
-	_vq_lengthlist__44u4__p7_1,
+	(long *)_vq_lengthlist__44u4__p7_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__44u4__p7_1,
+	(long *)_vq_quantlist__44u4__p7_1,
 	NULL,
-	&_vq_auxt__44u4__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u4__p7_2[] = {
+static const long _vq_quantlist__44u4__p7_2[] = {
 	8,
 	7,
 	9,
@@ -6595,7 +6595,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44u4__p7_2[] = {
+static const long _vq_lengthlist__44u4__p7_2[] = {
 	 2, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
@@ -6617,45 +6617,45 @@
 	10,
 };
 
-static float _vq_quantthresh__44u4__p7_2[] = {
+static const float _vq_quantthresh__44u4__p7_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__44u4__p7_2[] = {
+static const long _vq_quantmap__44u4__p7_2[] = {
 	   15,   13,   11,    9,    7,    5,    3,    1,
 	    0,    2,    4,    6,    8,   10,   12,   14,
 	   16,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u4__p7_2 = {
-	_vq_quantthresh__44u4__p7_2,
-	_vq_quantmap__44u4__p7_2,
+static const encode_aux_threshmatch _vq_auxt__44u4__p7_2 = {
+	(float *)_vq_quantthresh__44u4__p7_2,
+	(long *)_vq_quantmap__44u4__p7_2,
 	17,
 	17
 };
 
-static static_codebook _44u4__p7_2 = {
+static const static_codebook _44u4__p7_2 = {
 	2, 289,
-	_vq_lengthlist__44u4__p7_2,
+	(long *)_vq_lengthlist__44u4__p7_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44u4__p7_2,
+	(long *)_vq_quantlist__44u4__p7_2,
 	NULL,
-	&_vq_auxt__44u4__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u4__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u4__short[] = {
+static const long _huff_lengthlist__44u4__short[] = {
 	14,17,15,17,16,14,13,16,10, 7, 7,10,13,10,15,16,
 	 9, 4, 4, 6, 5, 7, 9,16,12, 8, 7, 8, 8, 8,11,16,
 	14, 7, 4, 6, 3, 5, 8,15,13, 8, 5, 7, 4, 5, 7,16,
 	12, 9, 6, 8, 3, 3, 5,16,14,13, 7,10, 5, 5, 7,15,
 };
 
-static static_codebook _huff_book__44u4__short = {
+static const static_codebook _huff_book__44u4__short = {
 	2, 64,
-	_huff_lengthlist__44u4__short,
+	(long *)_huff_lengthlist__44u4__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -6664,7 +6664,7 @@
 	0
 };
 
-static long _huff_lengthlist__44u5__long[] = {
+static const long _huff_lengthlist__44u5__long[] = {
 	 3, 8,13,12,14,12,16,11,13,14, 5, 4, 5, 6, 7, 8,
 	10, 9,12,15,10, 5, 5, 5, 6, 8, 9, 9,13,15,10, 5,
 	 5, 6, 6, 7, 8, 8,11,13,12, 7, 5, 6, 4, 6, 7, 7,
@@ -6674,9 +6674,9 @@
 	14, 8, 7, 8,
 };
 
-static static_codebook _huff_book__44u5__long = {
+static const static_codebook _huff_book__44u5__long = {
 	2, 100,
-	_huff_lengthlist__44u5__long,
+	(long *)_huff_lengthlist__44u5__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -6685,13 +6685,13 @@
 	0
 };
 
-static long _vq_quantlist__44u5__p1_0[] = {
+static const long _vq_quantlist__44u5__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u5__p1_0[] = {
+static const long _vq_lengthlist__44u5__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7,
 	 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10,
 	10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10,
@@ -6700,39 +6700,39 @@
 	12,
 };
 
-static float _vq_quantthresh__44u5__p1_0[] = {
+static const float _vq_quantthresh__44u5__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u5__p1_0[] = {
+static const long _vq_quantmap__44u5__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p1_0 = {
-	_vq_quantthresh__44u5__p1_0,
-	_vq_quantmap__44u5__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p1_0 = {
+	(float *)_vq_quantthresh__44u5__p1_0,
+	(long *)_vq_quantmap__44u5__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u5__p1_0 = {
+static const static_codebook _44u5__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u5__p1_0,
+	(long *)_vq_lengthlist__44u5__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u5__p1_0,
+	(long *)_vq_quantlist__44u5__p1_0,
 	NULL,
-	&_vq_auxt__44u5__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p2_0[] = {
+static const long _vq_quantlist__44u5__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u5__p2_0[] = {
+static const long _vq_lengthlist__44u5__p2_0[] = {
 	 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6,
 	 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8,
 	 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7,
@@ -6741,33 +6741,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u5__p2_0[] = {
+static const float _vq_quantthresh__44u5__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u5__p2_0[] = {
+static const long _vq_quantmap__44u5__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p2_0 = {
-	_vq_quantthresh__44u5__p2_0,
-	_vq_quantmap__44u5__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p2_0 = {
+	(float *)_vq_quantthresh__44u5__p2_0,
+	(long *)_vq_quantmap__44u5__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u5__p2_0 = {
+static const static_codebook _44u5__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u5__p2_0,
+	(long *)_vq_lengthlist__44u5__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u5__p2_0,
+	(long *)_vq_quantlist__44u5__p2_0,
 	NULL,
-	&_vq_auxt__44u5__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p3_0[] = {
+static const long _vq_quantlist__44u5__p3_0[] = {
 	2,
 	1,
 	3,
@@ -6775,7 +6775,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u5__p3_0[] = {
+static const long _vq_lengthlist__44u5__p3_0[] = {
 	 2, 4, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8,
 	10, 9,13,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9,
 	 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11,
@@ -6818,33 +6818,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44u5__p3_0[] = {
+static const float _vq_quantthresh__44u5__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u5__p3_0[] = {
+static const long _vq_quantmap__44u5__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p3_0 = {
-	_vq_quantthresh__44u5__p3_0,
-	_vq_quantmap__44u5__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p3_0 = {
+	(float *)_vq_quantthresh__44u5__p3_0,
+	(long *)_vq_quantmap__44u5__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u5__p3_0 = {
+static const static_codebook _44u5__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u5__p3_0,
+	(long *)_vq_lengthlist__44u5__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u5__p3_0,
+	(long *)_vq_quantlist__44u5__p3_0,
 	NULL,
-	&_vq_auxt__44u5__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p4_0[] = {
+static const long _vq_quantlist__44u5__p4_0[] = {
 	2,
 	1,
 	3,
@@ -6852,7 +6852,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u5__p4_0[] = {
+static const long _vq_lengthlist__44u5__p4_0[] = {
 	 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8,
 	 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 6, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10,
@@ -6895,33 +6895,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44u5__p4_0[] = {
+static const float _vq_quantthresh__44u5__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u5__p4_0[] = {
+static const long _vq_quantmap__44u5__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p4_0 = {
-	_vq_quantthresh__44u5__p4_0,
-	_vq_quantmap__44u5__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p4_0 = {
+	(float *)_vq_quantthresh__44u5__p4_0,
+	(long *)_vq_quantmap__44u5__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u5__p4_0 = {
+static const static_codebook _44u5__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u5__p4_0,
+	(long *)_vq_lengthlist__44u5__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u5__p4_0,
+	(long *)_vq_quantlist__44u5__p4_0,
 	NULL,
-	&_vq_auxt__44u5__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p5_0[] = {
+static const long _vq_quantlist__44u5__p5_0[] = {
 	4,
 	3,
 	5,
@@ -6933,7 +6933,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u5__p5_0[] = {
+static const long _vq_lengthlist__44u5__p5_0[] = {
 	 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8,
 	11,10, 3, 5, 5, 7, 8, 8, 8,10,11, 6, 8, 7,10, 9,
 	10,10,11,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8,
@@ -6942,34 +6942,34 @@
 	14,
 };
 
-static float _vq_quantthresh__44u5__p5_0[] = {
+static const float _vq_quantthresh__44u5__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u5__p5_0[] = {
+static const long _vq_quantmap__44u5__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p5_0 = {
-	_vq_quantthresh__44u5__p5_0,
-	_vq_quantmap__44u5__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p5_0 = {
+	(float *)_vq_quantthresh__44u5__p5_0,
+	(long *)_vq_quantmap__44u5__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u5__p5_0 = {
+static const static_codebook _44u5__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u5__p5_0,
+	(long *)_vq_lengthlist__44u5__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u5__p5_0,
+	(long *)_vq_quantlist__44u5__p5_0,
 	NULL,
-	&_vq_auxt__44u5__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p6_0[] = {
+static const long _vq_quantlist__44u5__p6_0[] = {
 	4,
 	3,
 	5,
@@ -6981,7 +6981,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u5__p6_0[] = {
+static const long _vq_lengthlist__44u5__p6_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7,
 	 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7,
 	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7,
@@ -6990,40 +6990,40 @@
 	11,
 };
 
-static float _vq_quantthresh__44u5__p6_0[] = {
+static const float _vq_quantthresh__44u5__p6_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u5__p6_0[] = {
+static const long _vq_quantmap__44u5__p6_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p6_0 = {
-	_vq_quantthresh__44u5__p6_0,
-	_vq_quantmap__44u5__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p6_0 = {
+	(float *)_vq_quantthresh__44u5__p6_0,
+	(long *)_vq_quantmap__44u5__p6_0,
 	9,
 	9
 };
 
-static static_codebook _44u5__p6_0 = {
+static const static_codebook _44u5__p6_0 = {
 	2, 81,
-	_vq_lengthlist__44u5__p6_0,
+	(long *)_vq_lengthlist__44u5__p6_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u5__p6_0,
+	(long *)_vq_quantlist__44u5__p6_0,
 	NULL,
-	&_vq_auxt__44u5__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p7_0[] = {
+static const long _vq_quantlist__44u5__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u5__p7_0[] = {
+static const long _vq_lengthlist__44u5__p7_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,11,10, 7,
 	11,10, 5, 9, 9, 7,10,10, 8,10,11, 4, 9, 9, 9,12,
 	12, 9,12,12, 8,12,12,11,12,12,10,12,13, 7,12,12,
@@ -7032,33 +7032,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44u5__p7_0[] = {
+static const float _vq_quantthresh__44u5__p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44u5__p7_0[] = {
+static const long _vq_quantmap__44u5__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p7_0 = {
-	_vq_quantthresh__44u5__p7_0,
-	_vq_quantmap__44u5__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p7_0 = {
+	(float *)_vq_quantthresh__44u5__p7_0,
+	(long *)_vq_quantmap__44u5__p7_0,
 	3,
 	3
 };
 
-static static_codebook _44u5__p7_0 = {
+static const static_codebook _44u5__p7_0 = {
 	4, 81,
-	_vq_lengthlist__44u5__p7_0,
+	(long *)_vq_lengthlist__44u5__p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44u5__p7_0,
+	(long *)_vq_quantlist__44u5__p7_0,
 	NULL,
-	&_vq_auxt__44u5__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p7_1[] = {
+static const long _vq_quantlist__44u5__p7_1[] = {
 	5,
 	4,
 	6,
@@ -7072,7 +7072,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u5__p7_1[] = {
+static const long _vq_lengthlist__44u5__p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7,
 	 8, 8, 9, 8, 8, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 8,
 	 9, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 6, 7, 7, 8,
@@ -7083,35 +7083,35 @@
 	 9, 9, 9, 9, 9,10,10,10,10,
 };
 
-static float _vq_quantthresh__44u5__p7_1[] = {
+static const float _vq_quantthresh__44u5__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__44u5__p7_1[] = {
+static const long _vq_quantmap__44u5__p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p7_1 = {
-	_vq_quantthresh__44u5__p7_1,
-	_vq_quantmap__44u5__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u5__p7_1 = {
+	(float *)_vq_quantthresh__44u5__p7_1,
+	(long *)_vq_quantmap__44u5__p7_1,
 	11,
 	11
 };
 
-static static_codebook _44u5__p7_1 = {
+static const static_codebook _44u5__p7_1 = {
 	2, 121,
-	_vq_lengthlist__44u5__p7_1,
+	(long *)_vq_lengthlist__44u5__p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u5__p7_1,
+	(long *)_vq_quantlist__44u5__p7_1,
 	NULL,
-	&_vq_auxt__44u5__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p8_0[] = {
+static const long _vq_quantlist__44u5__p8_0[] = {
 	5,
 	4,
 	6,
@@ -7125,7 +7125,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u5__p8_0[] = {
+static const long _vq_lengthlist__44u5__p8_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7,
 	 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11,
 	11, 6, 8, 7, 9, 9,10,10,11,11,13,12, 6, 8, 8, 9,
@@ -7136,35 +7136,35 @@
 	12,13,13,14,14,14,14,15,15,
 };
 
-static float _vq_quantthresh__44u5__p8_0[] = {
+static const float _vq_quantthresh__44u5__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__44u5__p8_0[] = {
+static const long _vq_quantmap__44u5__p8_0[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p8_0 = {
-	_vq_quantthresh__44u5__p8_0,
-	_vq_quantmap__44u5__p8_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p8_0 = {
+	(float *)_vq_quantthresh__44u5__p8_0,
+	(long *)_vq_quantmap__44u5__p8_0,
 	11,
 	11
 };
 
-static static_codebook _44u5__p8_0 = {
+static const static_codebook _44u5__p8_0 = {
 	2, 121,
-	_vq_lengthlist__44u5__p8_0,
+	(long *)_vq_lengthlist__44u5__p8_0,
 	1, -524582912, 1618345984, 4, 0,
-	_vq_quantlist__44u5__p8_0,
+	(long *)_vq_quantlist__44u5__p8_0,
 	NULL,
-	&_vq_auxt__44u5__p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p8_1[] = {
+static const long _vq_quantlist__44u5__p8_1[] = {
 	5,
 	4,
 	6,
@@ -7178,7 +7178,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u5__p8_1[] = {
+static const long _vq_lengthlist__44u5__p8_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 6,
 	 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8,
 	 8, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7,
@@ -7189,35 +7189,35 @@
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44u5__p8_1[] = {
+static const float _vq_quantthresh__44u5__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__44u5__p8_1[] = {
+static const long _vq_quantmap__44u5__p8_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p8_1 = {
-	_vq_quantthresh__44u5__p8_1,
-	_vq_quantmap__44u5__p8_1,
+static const encode_aux_threshmatch _vq_auxt__44u5__p8_1 = {
+	(float *)_vq_quantthresh__44u5__p8_1,
+	(long *)_vq_quantmap__44u5__p8_1,
 	11,
 	11
 };
 
-static static_codebook _44u5__p8_1 = {
+static const static_codebook _44u5__p8_1 = {
 	2, 121,
-	_vq_lengthlist__44u5__p8_1,
+	(long *)_vq_lengthlist__44u5__p8_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u5__p8_1,
+	(long *)_vq_quantlist__44u5__p8_1,
 	NULL,
-	&_vq_auxt__44u5__p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p9_0[] = {
+static const long _vq_quantlist__44u5__p9_0[] = {
 	6,
 	5,
 	7,
@@ -7233,7 +7233,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u5__p9_0[] = {
+static const long _vq_lengthlist__44u5__p9_0[] = {
 	 1, 3, 2,12,10,13,13,13,13,13,13,13,13, 4, 9, 9,
 	13,13,13,13,13,13,13,13,13,13, 5,10, 9,13,13,13,
 	13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,13,
@@ -7247,35 +7247,35 @@
 	12,12,12,12,12,12,12,12,12,
 };
 
-static float _vq_quantthresh__44u5__p9_0[] = {
+static const float _vq_quantthresh__44u5__p9_0[] = {
 	-1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, 
 	637.5, 892.5, 1147.5, 1402.5, 
 };
 
-static long _vq_quantmap__44u5__p9_0[] = {
+static const long _vq_quantmap__44u5__p9_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p9_0 = {
-	_vq_quantthresh__44u5__p9_0,
-	_vq_quantmap__44u5__p9_0,
+static const encode_aux_threshmatch _vq_auxt__44u5__p9_0 = {
+	(float *)_vq_quantthresh__44u5__p9_0,
+	(long *)_vq_quantmap__44u5__p9_0,
 	13,
 	13
 };
 
-static static_codebook _44u5__p9_0 = {
+static const static_codebook _44u5__p9_0 = {
 	2, 169,
-	_vq_lengthlist__44u5__p9_0,
+	(long *)_vq_lengthlist__44u5__p9_0,
 	1, -514332672, 1627381760, 4, 0,
-	_vq_quantlist__44u5__p9_0,
+	(long *)_vq_quantlist__44u5__p9_0,
 	NULL,
-	&_vq_auxt__44u5__p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p9_1[] = {
+static const long _vq_quantlist__44u5__p9_1[] = {
 	7,
 	6,
 	8,
@@ -7293,7 +7293,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u5__p9_1[] = {
+static const long _vq_lengthlist__44u5__p9_1[] = {
 	 1, 4, 4, 7, 7, 8, 8, 8, 7, 8, 7, 9, 8, 9, 9, 4,
 	 7, 6, 9, 8,10,10, 9, 8, 9, 9, 9, 9, 9, 8, 5, 6,
 	 6, 8, 9,10,10, 9, 9, 9,10,10,10,10,11, 7, 8, 8,
@@ -7311,35 +7311,35 @@
 	14,
 };
 
-static float _vq_quantthresh__44u5__p9_1[] = {
+static const float _vq_quantthresh__44u5__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__44u5__p9_1[] = {
+static const long _vq_quantmap__44u5__p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u5__p9_1 = {
-	_vq_quantthresh__44u5__p9_1,
-	_vq_quantmap__44u5__p9_1,
+static const encode_aux_threshmatch _vq_auxt__44u5__p9_1 = {
+	(float *)_vq_quantthresh__44u5__p9_1,
+	(long *)_vq_quantmap__44u5__p9_1,
 	15,
 	15
 };
 
-static static_codebook _44u5__p9_1 = {
+static const static_codebook _44u5__p9_1 = {
 	2, 225,
-	_vq_lengthlist__44u5__p9_1,
+	(long *)_vq_lengthlist__44u5__p9_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__44u5__p9_1,
+	(long *)_vq_quantlist__44u5__p9_1,
 	NULL,
-	&_vq_auxt__44u5__p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u5__p9_2[] = {
+static const long _vq_quantlist__44u5__p9_2[] = {
 	8,
 	7,
 	9,
@@ -7359,7 +7359,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44u5__p9_2[] = {
+static const long _vq_lengthlist__44u5__p9_2[] = {
 	 2, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9,
@@ -7381,36 +7381,36 @@
 	10,
 };
 
-static float _vq_quantthresh__44u5__p9_2[] = {
+static const float _vq_quantthresh__44u5__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__44u5__p9_2[] = {
+static const long _vq_quantmap__44u5__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__44u5__p9_2 = {
-	_vq_quantthresh__44u5__p9_2,
-	_vq_quantmap__44u5__p9_2,
+static const encode_aux_threshmatch _vq_auxt__44u5__p9_2 = {
+	(float *)_vq_quantthresh__44u5__p9_2,
+	(long *)_vq_quantmap__44u5__p9_2,
 	17,
 	17
 };
 
-static static_codebook _44u5__p9_2 = {
+static const static_codebook _44u5__p9_2 = {
 	2, 289,
-	_vq_lengthlist__44u5__p9_2,
+	(long *)_vq_lengthlist__44u5__p9_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44u5__p9_2,
+	(long *)_vq_quantlist__44u5__p9_2,
 	NULL,
-	&_vq_auxt__44u5__p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u5__p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u5__short[] = {
+static const long _huff_lengthlist__44u5__short[] = {
 	 4,10,17,13,17,13,17,17,17,17, 3, 6, 8, 9,11, 9,
 	15,12,16,17, 6, 5, 5, 7, 7, 8,10,11,17,17, 7, 8,
 	 7, 9, 9,10,13,13,17,17, 8, 6, 5, 7, 4, 7, 5, 8,
@@ -7420,9 +7420,9 @@
 	 6, 8,15,17,
 };
 
-static static_codebook _huff_book__44u5__short = {
+static const static_codebook _huff_book__44u5__short = {
 	2, 100,
-	_huff_lengthlist__44u5__short,
+	(long *)_huff_lengthlist__44u5__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -7431,7 +7431,7 @@
 	0
 };
 
-static long _huff_lengthlist__44u6__long[] = {
+static const long _huff_lengthlist__44u6__long[] = {
 	 3, 9,14,13,14,13,16,12,13,14, 5, 4, 6, 6, 8, 9,
 	11,10,12,15,10, 5, 5, 6, 6, 8,10,10,13,16,10, 6,
 	 6, 6, 6, 8, 9, 9,12,14,13, 7, 6, 6, 4, 6, 6, 7,
@@ -7441,9 +7441,9 @@
 	13, 8, 7, 7,
 };
 
-static static_codebook _huff_book__44u6__long = {
+static const static_codebook _huff_book__44u6__long = {
 	2, 100,
-	_huff_lengthlist__44u6__long,
+	(long *)_huff_lengthlist__44u6__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -7452,13 +7452,13 @@
 	0
 };
 
-static long _vq_quantlist__44u6__p1_0[] = {
+static const long _vq_quantlist__44u6__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u6__p1_0[] = {
+static const long _vq_lengthlist__44u6__p1_0[] = {
 	 1, 4, 4, 4, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7,
 	 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10,
 	10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10,
@@ -7467,39 +7467,39 @@
 	12,
 };
 
-static float _vq_quantthresh__44u6__p1_0[] = {
+static const float _vq_quantthresh__44u6__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u6__p1_0[] = {
+static const long _vq_quantmap__44u6__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p1_0 = {
-	_vq_quantthresh__44u6__p1_0,
-	_vq_quantmap__44u6__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p1_0 = {
+	(float *)_vq_quantthresh__44u6__p1_0,
+	(long *)_vq_quantmap__44u6__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u6__p1_0 = {
+static const static_codebook _44u6__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u6__p1_0,
+	(long *)_vq_lengthlist__44u6__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u6__p1_0,
+	(long *)_vq_quantlist__44u6__p1_0,
 	NULL,
-	&_vq_auxt__44u6__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p2_0[] = {
+static const long _vq_quantlist__44u6__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u6__p2_0[] = {
+static const long _vq_lengthlist__44u6__p2_0[] = {
 	 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6,
 	 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8,
 	 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 7,
@@ -7508,33 +7508,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u6__p2_0[] = {
+static const float _vq_quantthresh__44u6__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u6__p2_0[] = {
+static const long _vq_quantmap__44u6__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p2_0 = {
-	_vq_quantthresh__44u6__p2_0,
-	_vq_quantmap__44u6__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p2_0 = {
+	(float *)_vq_quantthresh__44u6__p2_0,
+	(long *)_vq_quantmap__44u6__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u6__p2_0 = {
+static const static_codebook _44u6__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u6__p2_0,
+	(long *)_vq_lengthlist__44u6__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u6__p2_0,
+	(long *)_vq_quantlist__44u6__p2_0,
 	NULL,
-	&_vq_auxt__44u6__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p3_0[] = {
+static const long _vq_quantlist__44u6__p3_0[] = {
 	2,
 	1,
 	3,
@@ -7542,7 +7542,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u6__p3_0[] = {
+static const long _vq_lengthlist__44u6__p3_0[] = {
 	 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8,
 	 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9,
 	 9,11,11, 7, 8, 9,11,11,10,11,11,14,14, 9,10,11,
@@ -7585,33 +7585,33 @@
 	19,
 };
 
-static float _vq_quantthresh__44u6__p3_0[] = {
+static const float _vq_quantthresh__44u6__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u6__p3_0[] = {
+static const long _vq_quantmap__44u6__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p3_0 = {
-	_vq_quantthresh__44u6__p3_0,
-	_vq_quantmap__44u6__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p3_0 = {
+	(float *)_vq_quantthresh__44u6__p3_0,
+	(long *)_vq_quantmap__44u6__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u6__p3_0 = {
+static const static_codebook _44u6__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u6__p3_0,
+	(long *)_vq_lengthlist__44u6__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u6__p3_0,
+	(long *)_vq_quantlist__44u6__p3_0,
 	NULL,
-	&_vq_auxt__44u6__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p4_0[] = {
+static const long _vq_quantlist__44u6__p4_0[] = {
 	2,
 	1,
 	3,
@@ -7619,7 +7619,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u6__p4_0[] = {
+static const long _vq_lengthlist__44u6__p4_0[] = {
 	 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8,
 	 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 7, 8, 9,10, 9,10,10,11,11, 9, 9,10,
@@ -7662,33 +7662,33 @@
 	13,
 };
 
-static float _vq_quantthresh__44u6__p4_0[] = {
+static const float _vq_quantthresh__44u6__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u6__p4_0[] = {
+static const long _vq_quantmap__44u6__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p4_0 = {
-	_vq_quantthresh__44u6__p4_0,
-	_vq_quantmap__44u6__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p4_0 = {
+	(float *)_vq_quantthresh__44u6__p4_0,
+	(long *)_vq_quantmap__44u6__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u6__p4_0 = {
+static const static_codebook _44u6__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u6__p4_0,
+	(long *)_vq_lengthlist__44u6__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u6__p4_0,
+	(long *)_vq_quantlist__44u6__p4_0,
 	NULL,
-	&_vq_auxt__44u6__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p5_0[] = {
+static const long _vq_quantlist__44u6__p5_0[] = {
 	4,
 	3,
 	5,
@@ -7700,7 +7700,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u6__p5_0[] = {
+static const long _vq_lengthlist__44u6__p5_0[] = {
 	 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8,
 	11,11, 3, 5, 5, 7, 8, 8, 8,11,11, 6, 8, 7, 9, 9,
 	10, 9,12,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8,
@@ -7709,34 +7709,34 @@
 	14,
 };
 
-static float _vq_quantthresh__44u6__p5_0[] = {
+static const float _vq_quantthresh__44u6__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u6__p5_0[] = {
+static const long _vq_quantmap__44u6__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p5_0 = {
-	_vq_quantthresh__44u6__p5_0,
-	_vq_quantmap__44u6__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p5_0 = {
+	(float *)_vq_quantthresh__44u6__p5_0,
+	(long *)_vq_quantmap__44u6__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u6__p5_0 = {
+static const static_codebook _44u6__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u6__p5_0,
+	(long *)_vq_lengthlist__44u6__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u6__p5_0,
+	(long *)_vq_quantlist__44u6__p5_0,
 	NULL,
-	&_vq_auxt__44u6__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p6_0[] = {
+static const long _vq_quantlist__44u6__p6_0[] = {
 	4,
 	3,
 	5,
@@ -7748,7 +7748,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u6__p6_0[] = {
+static const long _vq_lengthlist__44u6__p6_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7,
 	 9, 9, 4, 4, 5, 6, 6, 7, 8, 9, 9, 5, 6, 6, 7, 7,
 	 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7,
@@ -7757,40 +7757,40 @@
 	12,
 };
 
-static float _vq_quantthresh__44u6__p6_0[] = {
+static const float _vq_quantthresh__44u6__p6_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u6__p6_0[] = {
+static const long _vq_quantmap__44u6__p6_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p6_0 = {
-	_vq_quantthresh__44u6__p6_0,
-	_vq_quantmap__44u6__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p6_0 = {
+	(float *)_vq_quantthresh__44u6__p6_0,
+	(long *)_vq_quantmap__44u6__p6_0,
 	9,
 	9
 };
 
-static static_codebook _44u6__p6_0 = {
+static const static_codebook _44u6__p6_0 = {
 	2, 81,
-	_vq_lengthlist__44u6__p6_0,
+	(long *)_vq_lengthlist__44u6__p6_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u6__p6_0,
+	(long *)_vq_quantlist__44u6__p6_0,
 	NULL,
-	&_vq_auxt__44u6__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p7_0[] = {
+static const long _vq_quantlist__44u6__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u6__p7_0[] = {
+static const long _vq_lengthlist__44u6__p7_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10,10, 8,
 	10,10, 5, 8, 9, 7,10,10, 7,10, 9, 4, 8, 8, 9,11,
 	11, 8,11,11, 7,11,11,10,10,13,10,13,13, 7,11,11,
@@ -7799,33 +7799,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u6__p7_0[] = {
+static const float _vq_quantthresh__44u6__p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44u6__p7_0[] = {
+static const long _vq_quantmap__44u6__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p7_0 = {
-	_vq_quantthresh__44u6__p7_0,
-	_vq_quantmap__44u6__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p7_0 = {
+	(float *)_vq_quantthresh__44u6__p7_0,
+	(long *)_vq_quantmap__44u6__p7_0,
 	3,
 	3
 };
 
-static static_codebook _44u6__p7_0 = {
+static const static_codebook _44u6__p7_0 = {
 	4, 81,
-	_vq_lengthlist__44u6__p7_0,
+	(long *)_vq_lengthlist__44u6__p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44u6__p7_0,
+	(long *)_vq_quantlist__44u6__p7_0,
 	NULL,
-	&_vq_auxt__44u6__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p7_1[] = {
+static const long _vq_quantlist__44u6__p7_1[] = {
 	5,
 	4,
 	6,
@@ -7839,7 +7839,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u6__p7_1[] = {
+static const long _vq_lengthlist__44u6__p7_1[] = {
 	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 6,
 	 8, 8, 8, 8, 8, 8, 4, 5, 5, 6, 7, 8, 8, 8, 8, 8,
 	 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7,
@@ -7850,35 +7850,35 @@
 	 8, 8, 8, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__44u6__p7_1[] = {
+static const float _vq_quantthresh__44u6__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__44u6__p7_1[] = {
+static const long _vq_quantmap__44u6__p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p7_1 = {
-	_vq_quantthresh__44u6__p7_1,
-	_vq_quantmap__44u6__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u6__p7_1 = {
+	(float *)_vq_quantthresh__44u6__p7_1,
+	(long *)_vq_quantmap__44u6__p7_1,
 	11,
 	11
 };
 
-static static_codebook _44u6__p7_1 = {
+static const static_codebook _44u6__p7_1 = {
 	2, 121,
-	_vq_lengthlist__44u6__p7_1,
+	(long *)_vq_lengthlist__44u6__p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u6__p7_1,
+	(long *)_vq_quantlist__44u6__p7_1,
 	NULL,
-	&_vq_auxt__44u6__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p8_0[] = {
+static const long _vq_quantlist__44u6__p8_0[] = {
 	5,
 	4,
 	6,
@@ -7892,7 +7892,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u6__p8_0[] = {
+static const long _vq_lengthlist__44u6__p8_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7,
 	 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11,
 	11, 6, 8, 8, 9, 9,10,10,11,11,12,12, 6, 8, 8, 9,
@@ -7903,35 +7903,35 @@
 	12,13,13,14,14,14,15,15,15,
 };
 
-static float _vq_quantthresh__44u6__p8_0[] = {
+static const float _vq_quantthresh__44u6__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__44u6__p8_0[] = {
+static const long _vq_quantmap__44u6__p8_0[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p8_0 = {
-	_vq_quantthresh__44u6__p8_0,
-	_vq_quantmap__44u6__p8_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p8_0 = {
+	(float *)_vq_quantthresh__44u6__p8_0,
+	(long *)_vq_quantmap__44u6__p8_0,
 	11,
 	11
 };
 
-static static_codebook _44u6__p8_0 = {
+static const static_codebook _44u6__p8_0 = {
 	2, 121,
-	_vq_lengthlist__44u6__p8_0,
+	(long *)_vq_lengthlist__44u6__p8_0,
 	1, -524582912, 1618345984, 4, 0,
-	_vq_quantlist__44u6__p8_0,
+	(long *)_vq_quantlist__44u6__p8_0,
 	NULL,
-	&_vq_auxt__44u6__p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p8_1[] = {
+static const long _vq_quantlist__44u6__p8_1[] = {
 	5,
 	4,
 	6,
@@ -7945,7 +7945,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u6__p8_1[] = {
+static const long _vq_lengthlist__44u6__p8_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 7,
 	 7, 7, 8, 7, 8, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8,
 	 8, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 6, 7, 7,
@@ -7956,35 +7956,35 @@
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44u6__p8_1[] = {
+static const float _vq_quantthresh__44u6__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__44u6__p8_1[] = {
+static const long _vq_quantmap__44u6__p8_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p8_1 = {
-	_vq_quantthresh__44u6__p8_1,
-	_vq_quantmap__44u6__p8_1,
+static const encode_aux_threshmatch _vq_auxt__44u6__p8_1 = {
+	(float *)_vq_quantthresh__44u6__p8_1,
+	(long *)_vq_quantmap__44u6__p8_1,
 	11,
 	11
 };
 
-static static_codebook _44u6__p8_1 = {
+static const static_codebook _44u6__p8_1 = {
 	2, 121,
-	_vq_lengthlist__44u6__p8_1,
+	(long *)_vq_lengthlist__44u6__p8_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u6__p8_1,
+	(long *)_vq_quantlist__44u6__p8_1,
 	NULL,
-	&_vq_auxt__44u6__p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p9_0[] = {
+static const long _vq_quantlist__44u6__p9_0[] = {
 	7,
 	6,
 	8,
@@ -8002,7 +8002,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u6__p9_0[] = {
+static const long _vq_lengthlist__44u6__p9_0[] = {
 	 1, 3, 2, 9, 8,15,15,15,15,15,15,15,15,15,15, 4,
 	 8, 9,13,14,14,14,14,14,14,14,14,14,14,14, 5, 8,
 	 9,14,14,14,14,14,14,14,14,14,14,14,14,11,14,14,
@@ -8020,35 +8020,35 @@
 	14,
 };
 
-static float _vq_quantthresh__44u6__p9_0[] = {
+static const float _vq_quantthresh__44u6__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__44u6__p9_0[] = {
+static const long _vq_quantmap__44u6__p9_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p9_0 = {
-	_vq_quantthresh__44u6__p9_0,
-	_vq_quantmap__44u6__p9_0,
+static const encode_aux_threshmatch _vq_auxt__44u6__p9_0 = {
+	(float *)_vq_quantthresh__44u6__p9_0,
+	(long *)_vq_quantmap__44u6__p9_0,
 	15,
 	15
 };
 
-static static_codebook _44u6__p9_0 = {
+static const static_codebook _44u6__p9_0 = {
 	2, 225,
-	_vq_lengthlist__44u6__p9_0,
+	(long *)_vq_lengthlist__44u6__p9_0,
 	1, -514071552, 1627381760, 4, 0,
-	_vq_quantlist__44u6__p9_0,
+	(long *)_vq_quantlist__44u6__p9_0,
 	NULL,
-	&_vq_auxt__44u6__p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p9_1[] = {
+static const long _vq_quantlist__44u6__p9_1[] = {
 	7,
 	6,
 	8,
@@ -8066,7 +8066,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u6__p9_1[] = {
+static const long _vq_lengthlist__44u6__p9_1[] = {
 	 1, 4, 4, 7, 7, 8, 9, 8, 8, 9, 8, 9, 8, 9, 9, 4,
 	 7, 6, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 7,
 	 6, 9, 9,10,10, 9, 9,10,10,10,10,11,11, 7, 9, 8,
@@ -8084,35 +8084,35 @@
 	13,
 };
 
-static float _vq_quantthresh__44u6__p9_1[] = {
+static const float _vq_quantthresh__44u6__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__44u6__p9_1[] = {
+static const long _vq_quantmap__44u6__p9_1[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u6__p9_1 = {
-	_vq_quantthresh__44u6__p9_1,
-	_vq_quantmap__44u6__p9_1,
+static const encode_aux_threshmatch _vq_auxt__44u6__p9_1 = {
+	(float *)_vq_quantthresh__44u6__p9_1,
+	(long *)_vq_quantmap__44u6__p9_1,
 	15,
 	15
 };
 
-static static_codebook _44u6__p9_1 = {
+static const static_codebook _44u6__p9_1 = {
 	2, 225,
-	_vq_lengthlist__44u6__p9_1,
+	(long *)_vq_lengthlist__44u6__p9_1,
 	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__44u6__p9_1,
+	(long *)_vq_quantlist__44u6__p9_1,
 	NULL,
-	&_vq_auxt__44u6__p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u6__p9_2[] = {
+static const long _vq_quantlist__44u6__p9_2[] = {
 	8,
 	7,
 	9,
@@ -8132,7 +8132,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44u6__p9_2[] = {
+static const long _vq_lengthlist__44u6__p9_2[] = {
 	 3, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 9,
 	 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
 	 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
@@ -8154,36 +8154,36 @@
 	10,
 };
 
-static float _vq_quantthresh__44u6__p9_2[] = {
+static const float _vq_quantthresh__44u6__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__44u6__p9_2[] = {
+static const long _vq_quantmap__44u6__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__44u6__p9_2 = {
-	_vq_quantthresh__44u6__p9_2,
-	_vq_quantmap__44u6__p9_2,
+static const encode_aux_threshmatch _vq_auxt__44u6__p9_2 = {
+	(float *)_vq_quantthresh__44u6__p9_2,
+	(long *)_vq_quantmap__44u6__p9_2,
 	17,
 	17
 };
 
-static static_codebook _44u6__p9_2 = {
+static const static_codebook _44u6__p9_2 = {
 	2, 289,
-	_vq_lengthlist__44u6__p9_2,
+	(long *)_vq_lengthlist__44u6__p9_2,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44u6__p9_2,
+	(long *)_vq_quantlist__44u6__p9_2,
 	NULL,
-	&_vq_auxt__44u6__p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u6__p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u6__short[] = {
+static const long _huff_lengthlist__44u6__short[] = {
 	 4,11,16,13,17,13,17,16,17,17, 4, 7, 9, 9,13,10,
 	16,12,16,17, 7, 6, 5, 7, 8, 9,12,12,16,17, 6, 9,
 	 7, 9,10,10,15,15,17,17, 6, 7, 5, 7, 5, 7, 7,10,
@@ -8193,9 +8193,9 @@
 	 7, 6, 9,16,
 };
 
-static static_codebook _huff_book__44u6__short = {
+static const static_codebook _huff_book__44u6__short = {
 	2, 100,
-	_huff_lengthlist__44u6__short,
+	(long *)_huff_lengthlist__44u6__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -8204,7 +8204,7 @@
 	0
 };
 
-static long _huff_lengthlist__44u7__long[] = {
+static const long _huff_lengthlist__44u7__long[] = {
 	 3, 9,14,13,15,14,16,13,13,14, 5, 5, 7, 7, 8, 9,
 	11,10,12,15,10, 6, 5, 6, 6, 9,10,10,13,16,10, 6,
 	 6, 6, 6, 8, 9, 9,12,15,14, 7, 6, 6, 5, 6, 6, 8,
@@ -8214,9 +8214,9 @@
 	12, 8, 6, 7,
 };
 
-static static_codebook _huff_book__44u7__long = {
+static const static_codebook _huff_book__44u7__long = {
 	2, 100,
-	_huff_lengthlist__44u7__long,
+	(long *)_huff_lengthlist__44u7__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -8225,13 +8225,13 @@
 	0
 };
 
-static long _vq_quantlist__44u7__p1_0[] = {
+static const long _vq_quantlist__44u7__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u7__p1_0[] = {
+static const long _vq_lengthlist__44u7__p1_0[] = {
 	 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7,
 	10,10, 5, 8, 8, 7,10,10, 8,10,10, 5, 8, 8, 8,11,
 	10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10,
@@ -8240,39 +8240,39 @@
 	12,
 };
 
-static float _vq_quantthresh__44u7__p1_0[] = {
+static const float _vq_quantthresh__44u7__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u7__p1_0[] = {
+static const long _vq_quantmap__44u7__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p1_0 = {
-	_vq_quantthresh__44u7__p1_0,
-	_vq_quantmap__44u7__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p1_0 = {
+	(float *)_vq_quantthresh__44u7__p1_0,
+	(long *)_vq_quantmap__44u7__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u7__p1_0 = {
+static const static_codebook _44u7__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u7__p1_0,
+	(long *)_vq_lengthlist__44u7__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u7__p1_0,
+	(long *)_vq_quantlist__44u7__p1_0,
 	NULL,
-	&_vq_auxt__44u7__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p2_0[] = {
+static const long _vq_quantlist__44u7__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u7__p2_0[] = {
+static const long _vq_lengthlist__44u7__p2_0[] = {
 	 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6,
 	 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8,
 	 7, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7,
@@ -8281,33 +8281,33 @@
 	 9,
 };
 
-static float _vq_quantthresh__44u7__p2_0[] = {
+static const float _vq_quantthresh__44u7__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u7__p2_0[] = {
+static const long _vq_quantmap__44u7__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p2_0 = {
-	_vq_quantthresh__44u7__p2_0,
-	_vq_quantmap__44u7__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p2_0 = {
+	(float *)_vq_quantthresh__44u7__p2_0,
+	(long *)_vq_quantmap__44u7__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44u7__p2_0 = {
+static const static_codebook _44u7__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44u7__p2_0,
+	(long *)_vq_lengthlist__44u7__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u7__p2_0,
+	(long *)_vq_quantlist__44u7__p2_0,
 	NULL,
-	&_vq_auxt__44u7__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p3_0[] = {
+static const long _vq_quantlist__44u7__p3_0[] = {
 	2,
 	1,
 	3,
@@ -8315,7 +8315,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u7__p3_0[] = {
+static const long _vq_lengthlist__44u7__p3_0[] = {
 	 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8,
 	 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9,
 	 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11,
@@ -8358,33 +8358,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44u7__p3_0[] = {
+static const float _vq_quantthresh__44u7__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u7__p3_0[] = {
+static const long _vq_quantmap__44u7__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p3_0 = {
-	_vq_quantthresh__44u7__p3_0,
-	_vq_quantmap__44u7__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p3_0 = {
+	(float *)_vq_quantthresh__44u7__p3_0,
+	(long *)_vq_quantmap__44u7__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44u7__p3_0 = {
+static const static_codebook _44u7__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44u7__p3_0,
+	(long *)_vq_lengthlist__44u7__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u7__p3_0,
+	(long *)_vq_quantlist__44u7__p3_0,
 	NULL,
-	&_vq_auxt__44u7__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p4_0[] = {
+static const long _vq_quantlist__44u7__p4_0[] = {
 	2,
 	1,
 	3,
@@ -8392,7 +8392,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u7__p4_0[] = {
+static const long _vq_lengthlist__44u7__p4_0[] = {
 	 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8,
 	 9, 9,11,11, 8, 9, 9,10,11, 6, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 6, 7, 8, 9,10, 9,10,10,12,12, 9, 9,10,
@@ -8435,33 +8435,33 @@
 	14,
 };
 
-static float _vq_quantthresh__44u7__p4_0[] = {
+static const float _vq_quantthresh__44u7__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u7__p4_0[] = {
+static const long _vq_quantmap__44u7__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p4_0 = {
-	_vq_quantthresh__44u7__p4_0,
-	_vq_quantmap__44u7__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p4_0 = {
+	(float *)_vq_quantthresh__44u7__p4_0,
+	(long *)_vq_quantmap__44u7__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44u7__p4_0 = {
+static const static_codebook _44u7__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44u7__p4_0,
+	(long *)_vq_lengthlist__44u7__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u7__p4_0,
+	(long *)_vq_quantlist__44u7__p4_0,
 	NULL,
-	&_vq_auxt__44u7__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p5_0[] = {
+static const long _vq_quantlist__44u7__p5_0[] = {
 	4,
 	3,
 	5,
@@ -8473,7 +8473,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u7__p5_0[] = {
+static const long _vq_lengthlist__44u7__p5_0[] = {
 	 2, 3, 3, 6, 6, 7, 8,10,10, 4, 5, 5, 8, 7, 8, 8,
 	11,11, 3, 5, 5, 7, 7, 8, 9,11,11, 6, 8, 7, 9, 9,
 	10,10,12,12, 6, 7, 8, 9,10,10,10,12,12, 8, 8, 8,
@@ -8482,34 +8482,34 @@
 	14,
 };
 
-static float _vq_quantthresh__44u7__p5_0[] = {
+static const float _vq_quantthresh__44u7__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u7__p5_0[] = {
+static const long _vq_quantmap__44u7__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p5_0 = {
-	_vq_quantthresh__44u7__p5_0,
-	_vq_quantmap__44u7__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p5_0 = {
+	(float *)_vq_quantthresh__44u7__p5_0,
+	(long *)_vq_quantmap__44u7__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44u7__p5_0 = {
+static const static_codebook _44u7__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44u7__p5_0,
+	(long *)_vq_lengthlist__44u7__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u7__p5_0,
+	(long *)_vq_quantlist__44u7__p5_0,
 	NULL,
-	&_vq_auxt__44u7__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p6_0[] = {
+static const long _vq_quantlist__44u7__p6_0[] = {
 	4,
 	3,
 	5,
@@ -8521,7 +8521,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u7__p6_0[] = {
+static const long _vq_lengthlist__44u7__p6_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 8, 7,
 	 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7,
 	 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7,
@@ -8530,40 +8530,40 @@
 	12,
 };
 
-static float _vq_quantthresh__44u7__p6_0[] = {
+static const float _vq_quantthresh__44u7__p6_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u7__p6_0[] = {
+static const long _vq_quantmap__44u7__p6_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p6_0 = {
-	_vq_quantthresh__44u7__p6_0,
-	_vq_quantmap__44u7__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p6_0 = {
+	(float *)_vq_quantthresh__44u7__p6_0,
+	(long *)_vq_quantmap__44u7__p6_0,
 	9,
 	9
 };
 
-static static_codebook _44u7__p6_0 = {
+static const static_codebook _44u7__p6_0 = {
 	2, 81,
-	_vq_lengthlist__44u7__p6_0,
+	(long *)_vq_lengthlist__44u7__p6_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u7__p6_0,
+	(long *)_vq_quantlist__44u7__p6_0,
 	NULL,
-	&_vq_auxt__44u7__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p7_0[] = {
+static const long _vq_quantlist__44u7__p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u7__p7_0[] = {
+static const long _vq_lengthlist__44u7__p7_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8, 9, 9, 7,
 	10,10, 5, 8, 9, 7, 9,10, 8, 9, 9, 4, 9, 9, 9,11,
 	10, 8,10,10, 7,11,10,10,10,12,10,12,12, 7,10,10,
@@ -8572,33 +8572,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u7__p7_0[] = {
+static const float _vq_quantthresh__44u7__p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44u7__p7_0[] = {
+static const long _vq_quantmap__44u7__p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p7_0 = {
-	_vq_quantthresh__44u7__p7_0,
-	_vq_quantmap__44u7__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p7_0 = {
+	(float *)_vq_quantthresh__44u7__p7_0,
+	(long *)_vq_quantmap__44u7__p7_0,
 	3,
 	3
 };
 
-static static_codebook _44u7__p7_0 = {
+static const static_codebook _44u7__p7_0 = {
 	4, 81,
-	_vq_lengthlist__44u7__p7_0,
+	(long *)_vq_lengthlist__44u7__p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44u7__p7_0,
+	(long *)_vq_quantlist__44u7__p7_0,
 	NULL,
-	&_vq_auxt__44u7__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p7_1[] = {
+static const long _vq_quantlist__44u7__p7_1[] = {
 	5,
 	4,
 	6,
@@ -8612,7 +8612,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u7__p7_1[] = {
+static const long _vq_lengthlist__44u7__p7_1[] = {
 	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6,
 	 8, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
 	 8, 6, 7, 6, 7, 7, 8, 8, 9, 9, 9, 9, 6, 6, 7, 7,
@@ -8623,35 +8623,35 @@
 	 8, 9, 9, 9, 9, 9,10,10,10,
 };
 
-static float _vq_quantthresh__44u7__p7_1[] = {
+static const float _vq_quantthresh__44u7__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__44u7__p7_1[] = {
+static const long _vq_quantmap__44u7__p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p7_1 = {
-	_vq_quantthresh__44u7__p7_1,
-	_vq_quantmap__44u7__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u7__p7_1 = {
+	(float *)_vq_quantthresh__44u7__p7_1,
+	(long *)_vq_quantmap__44u7__p7_1,
 	11,
 	11
 };
 
-static static_codebook _44u7__p7_1 = {
+static const static_codebook _44u7__p7_1 = {
 	2, 121,
-	_vq_lengthlist__44u7__p7_1,
+	(long *)_vq_lengthlist__44u7__p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u7__p7_1,
+	(long *)_vq_quantlist__44u7__p7_1,
 	NULL,
-	&_vq_auxt__44u7__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p8_0[] = {
+static const long _vq_quantlist__44u7__p8_0[] = {
 	5,
 	4,
 	6,
@@ -8665,7 +8665,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u7__p8_0[] = {
+static const long _vq_lengthlist__44u7__p8_0[] = {
 	 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7,
 	 9, 9,11,10,12,12, 5, 6, 5, 7, 7, 9, 9,10,11,12,
 	12, 6, 7, 7, 8, 8,10,10,11,11,13,13, 6, 7, 7, 8,
@@ -8676,35 +8676,35 @@
 	12,13,13,14,14,15,15,15,16,
 };
 
-static float _vq_quantthresh__44u7__p8_0[] = {
+static const float _vq_quantthresh__44u7__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__44u7__p8_0[] = {
+static const long _vq_quantmap__44u7__p8_0[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p8_0 = {
-	_vq_quantthresh__44u7__p8_0,
-	_vq_quantmap__44u7__p8_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p8_0 = {
+	(float *)_vq_quantthresh__44u7__p8_0,
+	(long *)_vq_quantmap__44u7__p8_0,
 	11,
 	11
 };
 
-static static_codebook _44u7__p8_0 = {
+static const static_codebook _44u7__p8_0 = {
 	2, 121,
-	_vq_lengthlist__44u7__p8_0,
+	(long *)_vq_lengthlist__44u7__p8_0,
 	1, -524582912, 1618345984, 4, 0,
-	_vq_quantlist__44u7__p8_0,
+	(long *)_vq_quantlist__44u7__p8_0,
 	NULL,
-	&_vq_auxt__44u7__p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p8_1[] = {
+static const long _vq_quantlist__44u7__p8_1[] = {
 	5,
 	4,
 	6,
@@ -8718,7 +8718,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u7__p8_1[] = {
+static const long _vq_lengthlist__44u7__p8_1[] = {
 	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7,
 	 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7,
 	 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7,
@@ -8729,35 +8729,35 @@
 	 7, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44u7__p8_1[] = {
+static const float _vq_quantthresh__44u7__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__44u7__p8_1[] = {
+static const long _vq_quantmap__44u7__p8_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p8_1 = {
-	_vq_quantthresh__44u7__p8_1,
-	_vq_quantmap__44u7__p8_1,
+static const encode_aux_threshmatch _vq_auxt__44u7__p8_1 = {
+	(float *)_vq_quantthresh__44u7__p8_1,
+	(long *)_vq_quantmap__44u7__p8_1,
 	11,
 	11
 };
 
-static static_codebook _44u7__p8_1 = {
+static const static_codebook _44u7__p8_1 = {
 	2, 121,
-	_vq_lengthlist__44u7__p8_1,
+	(long *)_vq_lengthlist__44u7__p8_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u7__p8_1,
+	(long *)_vq_quantlist__44u7__p8_1,
 	NULL,
-	&_vq_auxt__44u7__p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p9_0[] = {
+static const long _vq_quantlist__44u7__p9_0[] = {
 	5,
 	4,
 	6,
@@ -8771,7 +8771,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u7__p9_0[] = {
+static const long _vq_lengthlist__44u7__p9_0[] = {
 	 1, 3, 3,10,10,10,10,10,10,10,10, 4,10,10,10,10,
 	10,10,10,10,10,10, 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,
@@ -8782,35 +8782,35 @@
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__44u7__p9_0[] = {
+static const float _vq_quantthresh__44u7__p9_0[] = {
 	-2866.5, -2229.5, -1592.5, -955.5, -318.5, 318.5, 955.5, 1592.5, 
 	2229.5, 2866.5, 
 };
 
-static long _vq_quantmap__44u7__p9_0[] = {
+static const long _vq_quantmap__44u7__p9_0[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p9_0 = {
-	_vq_quantthresh__44u7__p9_0,
-	_vq_quantmap__44u7__p9_0,
+static const encode_aux_threshmatch _vq_auxt__44u7__p9_0 = {
+	(float *)_vq_quantthresh__44u7__p9_0,
+	(long *)_vq_quantmap__44u7__p9_0,
 	11,
 	11
 };
 
-static static_codebook _44u7__p9_0 = {
+static const static_codebook _44u7__p9_0 = {
 	2, 121,
-	_vq_lengthlist__44u7__p9_0,
+	(long *)_vq_lengthlist__44u7__p9_0,
 	1, -512171520, 1630791680, 4, 0,
-	_vq_quantlist__44u7__p9_0,
+	(long *)_vq_quantlist__44u7__p9_0,
 	NULL,
-	&_vq_auxt__44u7__p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p9_1[] = {
+static const long _vq_quantlist__44u7__p9_1[] = {
 	6,
 	5,
 	7,
@@ -8826,7 +8826,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u7__p9_1[] = {
+static const long _vq_lengthlist__44u7__p9_1[] = {
 	 1, 4, 4, 6, 5, 8, 6, 9, 8,10, 9,11,10, 4, 6, 6,
 	 8, 8, 9, 9,11,10,11,11,11,11, 4, 6, 6, 8, 8,10,
 	 9,11,11,11,11,11,12, 6, 8, 8,10,10,11,11,12,12,
@@ -8840,35 +8840,35 @@
 	15,15,15,15,17,17,16,17,16,
 };
 
-static float _vq_quantthresh__44u7__p9_1[] = {
+static const float _vq_quantthresh__44u7__p9_1[] = {
 	-269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 24.5, 73.5, 
 	122.5, 171.5, 220.5, 269.5, 
 };
 
-static long _vq_quantmap__44u7__p9_1[] = {
+static const long _vq_quantmap__44u7__p9_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p9_1 = {
-	_vq_quantthresh__44u7__p9_1,
-	_vq_quantmap__44u7__p9_1,
+static const encode_aux_threshmatch _vq_auxt__44u7__p9_1 = {
+	(float *)_vq_quantthresh__44u7__p9_1,
+	(long *)_vq_quantmap__44u7__p9_1,
 	13,
 	13
 };
 
-static static_codebook _44u7__p9_1 = {
+static const static_codebook _44u7__p9_1 = {
 	2, 169,
-	_vq_lengthlist__44u7__p9_1,
+	(long *)_vq_lengthlist__44u7__p9_1,
 	1, -518889472, 1622704128, 4, 0,
-	_vq_quantlist__44u7__p9_1,
+	(long *)_vq_quantlist__44u7__p9_1,
 	NULL,
-	&_vq_auxt__44u7__p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u7__p9_2[] = {
+static const long _vq_quantlist__44u7__p9_2[] = {
 	24,
 	23,
 	25,
@@ -8920,14 +8920,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44u7__p9_2[] = {
+static const long _vq_lengthlist__44u7__p9_2[] = {
 	 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
 	 8,
 };
 
-static float _vq_quantthresh__44u7__p9_2[] = {
+static const float _vq_quantthresh__44u7__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, 
@@ -8936,7 +8936,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44u7__p9_2[] = {
+static const long _vq_quantmap__44u7__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,
@@ -8946,25 +8946,25 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u7__p9_2 = {
-	_vq_quantthresh__44u7__p9_2,
-	_vq_quantmap__44u7__p9_2,
+static const encode_aux_threshmatch _vq_auxt__44u7__p9_2 = {
+	(float *)_vq_quantthresh__44u7__p9_2,
+	(long *)_vq_quantmap__44u7__p9_2,
 	49,
 	49
 };
 
-static static_codebook _44u7__p9_2 = {
+static const static_codebook _44u7__p9_2 = {
 	1, 49,
-	_vq_lengthlist__44u7__p9_2,
+	(long *)_vq_lengthlist__44u7__p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44u7__p9_2,
+	(long *)_vq_quantlist__44u7__p9_2,
 	NULL,
-	&_vq_auxt__44u7__p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u7__p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u7__short[] = {
+static const long _huff_lengthlist__44u7__short[] = {
 	 5,12,17,16,16,17,17,17,17,17, 4, 7,11,11,12, 9,
 	17,10,17,17, 7, 7, 8, 9, 7, 9,11,10,15,17, 7, 9,
 	10,11,10,12,14,12,16,17, 7, 8, 5, 7, 4, 7, 7, 8,
@@ -8974,9 +8974,9 @@
 	 6, 8, 5, 9,
 };
 
-static static_codebook _huff_book__44u7__short = {
+static const static_codebook _huff_book__44u7__short = {
 	2, 100,
-	_huff_lengthlist__44u7__short,
+	(long *)_huff_lengthlist__44u7__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -8985,7 +8985,7 @@
 	0
 };
 
-static long _huff_lengthlist__44u8__long[] = {
+static const long _huff_lengthlist__44u8__long[] = {
 	 3, 9,13,14,14,15,14,14,15,15, 5, 4, 6, 8,10,12,
 	12,14,15,15, 9, 5, 4, 5, 8,10,11,13,16,16,10, 7,
 	 4, 3, 5, 7, 9,11,13,13,10, 9, 7, 4, 4, 6, 8,10,
@@ -8995,9 +8995,9 @@
 	10, 8, 8, 9,
 };
 
-static static_codebook _huff_book__44u8__long = {
+static const static_codebook _huff_book__44u8__long = {
 	2, 100,
-	_huff_lengthlist__44u8__long,
+	(long *)_huff_lengthlist__44u8__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -9006,7 +9006,7 @@
 	0
 };
 
-static long _huff_lengthlist__44u8__short[] = {
+static const long _huff_lengthlist__44u8__short[] = {
 	 6,14,18,18,17,17,17,17,17,17, 4, 7, 9, 9,10,13,
 	15,17,17,17, 6, 7, 5, 6, 8,11,16,17,16,17, 5, 7,
 	 5, 4, 6,10,14,17,17,17, 6, 6, 6, 5, 7,10,13,16,
@@ -9016,9 +9016,9 @@
 	10,10,15,17,
 };
 
-static static_codebook _huff_book__44u8__short = {
+static const static_codebook _huff_book__44u8__short = {
 	2, 100,
-	_huff_lengthlist__44u8__short,
+	(long *)_huff_lengthlist__44u8__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -9027,13 +9027,13 @@
 	0
 };
 
-static long _vq_quantlist__44u8_p1_0[] = {
+static const long _vq_quantlist__44u8_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u8_p1_0[] = {
+static const long _vq_lengthlist__44u8_p1_0[] = {
 	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7,
 	 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 7, 9,
 	 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,10, 7, 9, 9,
@@ -9042,33 +9042,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u8_p1_0[] = {
+static const float _vq_quantthresh__44u8_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u8_p1_0[] = {
+static const long _vq_quantmap__44u8_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p1_0 = {
-	_vq_quantthresh__44u8_p1_0,
-	_vq_quantmap__44u8_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p1_0 = {
+	(float *)_vq_quantthresh__44u8_p1_0,
+	(long *)_vq_quantmap__44u8_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u8_p1_0 = {
+static const static_codebook _44u8_p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u8_p1_0,
+	(long *)_vq_lengthlist__44u8_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u8_p1_0,
+	(long *)_vq_quantlist__44u8_p1_0,
 	NULL,
-	&_vq_auxt__44u8_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p2_0[] = {
+static const long _vq_quantlist__44u8_p2_0[] = {
 	2,
 	1,
 	3,
@@ -9076,7 +9076,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u8_p2_0[] = {
+static const long _vq_lengthlist__44u8_p2_0[] = {
 	 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8,
 	 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,10,
@@ -9119,33 +9119,33 @@
 	14,
 };
 
-static float _vq_quantthresh__44u8_p2_0[] = {
+static const float _vq_quantthresh__44u8_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u8_p2_0[] = {
+static const long _vq_quantmap__44u8_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p2_0 = {
-	_vq_quantthresh__44u8_p2_0,
-	_vq_quantmap__44u8_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p2_0 = {
+	(float *)_vq_quantthresh__44u8_p2_0,
+	(long *)_vq_quantmap__44u8_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44u8_p2_0 = {
+static const static_codebook _44u8_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44u8_p2_0,
+	(long *)_vq_lengthlist__44u8_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u8_p2_0,
+	(long *)_vq_quantlist__44u8_p2_0,
 	NULL,
-	&_vq_auxt__44u8_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p3_0[] = {
+static const long _vq_quantlist__44u8_p3_0[] = {
 	4,
 	3,
 	5,
@@ -9157,7 +9157,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u8_p3_0[] = {
+static const long _vq_lengthlist__44u8_p3_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7,
 	 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7,
 	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7,
@@ -9166,34 +9166,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44u8_p3_0[] = {
+static const float _vq_quantthresh__44u8_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u8_p3_0[] = {
+static const long _vq_quantmap__44u8_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p3_0 = {
-	_vq_quantthresh__44u8_p3_0,
-	_vq_quantmap__44u8_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p3_0 = {
+	(float *)_vq_quantthresh__44u8_p3_0,
+	(long *)_vq_quantmap__44u8_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44u8_p3_0 = {
+static const static_codebook _44u8_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44u8_p3_0,
+	(long *)_vq_lengthlist__44u8_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u8_p3_0,
+	(long *)_vq_quantlist__44u8_p3_0,
 	NULL,
-	&_vq_auxt__44u8_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p4_0[] = {
+static const long _vq_quantlist__44u8_p4_0[] = {
 	8,
 	7,
 	9,
@@ -9213,7 +9213,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44u8_p4_0[] = {
+static const long _vq_lengthlist__44u8_p4_0[] = {
 	 4, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,11,11,
 	11, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,
 	12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
@@ -9235,42 +9235,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44u8_p4_0[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p4_0[] = {
+static const long _vq_quantmap__44u8_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__44u8_p4_0 = {
-	_vq_quantthresh__44u8_p4_0,
-	_vq_quantmap__44u8_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p4_0 = {
+	(float *)_vq_quantthresh__44u8_p4_0,
+	(long *)_vq_quantmap__44u8_p4_0,
 	17,
 	17
 };
 
-static static_codebook _44u8_p4_0 = {
+static const static_codebook _44u8_p4_0 = {
 	2, 289,
-	_vq_lengthlist__44u8_p4_0,
+	(long *)_vq_lengthlist__44u8_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44u8_p4_0,
+	(long *)_vq_quantlist__44u8_p4_0,
 	NULL,
-	&_vq_auxt__44u8_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p5_0[] = {
+static const long _vq_quantlist__44u8_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u8_p5_0[] = {
+static const long _vq_lengthlist__44u8_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7,
 	 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10,
 	10, 8,10,10, 7,10,10, 9,10,12, 9,12,11, 7,10,10,
@@ -9279,33 +9279,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u8_p5_0[] = {
+static const float _vq_quantthresh__44u8_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44u8_p5_0[] = {
+static const long _vq_quantmap__44u8_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p5_0 = {
-	_vq_quantthresh__44u8_p5_0,
-	_vq_quantmap__44u8_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p5_0 = {
+	(float *)_vq_quantthresh__44u8_p5_0,
+	(long *)_vq_quantmap__44u8_p5_0,
 	3,
 	3
 };
 
-static static_codebook _44u8_p5_0 = {
+static const static_codebook _44u8_p5_0 = {
 	4, 81,
-	_vq_lengthlist__44u8_p5_0,
+	(long *)_vq_lengthlist__44u8_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44u8_p5_0,
+	(long *)_vq_quantlist__44u8_p5_0,
 	NULL,
-	&_vq_auxt__44u8_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p5_1[] = {
+static const long _vq_quantlist__44u8_p5_1[] = {
 	5,
 	4,
 	6,
@@ -9319,7 +9319,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u8_p5_1[] = {
+static const long _vq_lengthlist__44u8_p5_1[] = {
 	 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 5, 5, 6, 6,
 	 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8,
 	 8, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 7,
@@ -9330,35 +9330,35 @@
 	 8, 8, 8, 8, 8, 8, 8, 9, 9,
 };
 
-static float _vq_quantthresh__44u8_p5_1[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p5_1[] = {
+static const long _vq_quantmap__44u8_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p5_1 = {
-	_vq_quantthresh__44u8_p5_1,
-	_vq_quantmap__44u8_p5_1,
+static const encode_aux_threshmatch _vq_auxt__44u8_p5_1 = {
+	(float *)_vq_quantthresh__44u8_p5_1,
+	(long *)_vq_quantmap__44u8_p5_1,
 	11,
 	11
 };
 
-static static_codebook _44u8_p5_1 = {
+static const static_codebook _44u8_p5_1 = {
 	2, 121,
-	_vq_lengthlist__44u8_p5_1,
+	(long *)_vq_lengthlist__44u8_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u8_p5_1,
+	(long *)_vq_quantlist__44u8_p5_1,
 	NULL,
-	&_vq_auxt__44u8_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p6_0[] = {
+static const long _vq_quantlist__44u8_p6_0[] = {
 	6,
 	5,
 	7,
@@ -9374,7 +9374,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u8_p6_0[] = {
+static const long _vq_lengthlist__44u8_p6_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 8,
 	 8, 8, 8, 9, 9,10,10, 6, 7, 7, 7, 8, 8, 8, 8, 9,
@@ -9388,35 +9388,35 @@
 	11,11,11,11,11,12,11,12,12,
 };
 
-static float _vq_quantthresh__44u8_p6_0[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p6_0[] = {
+static const long _vq_quantmap__44u8_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p6_0 = {
-	_vq_quantthresh__44u8_p6_0,
-	_vq_quantmap__44u8_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p6_0 = {
+	(float *)_vq_quantthresh__44u8_p6_0,
+	(long *)_vq_quantmap__44u8_p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u8_p6_0 = {
+static const static_codebook _44u8_p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u8_p6_0,
+	(long *)_vq_lengthlist__44u8_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u8_p6_0,
+	(long *)_vq_quantlist__44u8_p6_0,
 	NULL,
-	&_vq_auxt__44u8_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p6_1[] = {
+static const long _vq_quantlist__44u8_p6_1[] = {
 	2,
 	1,
 	3,
@@ -9424,38 +9424,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u8_p6_1[] = {
+static const long _vq_lengthlist__44u8_p6_1[] = {
 	 3, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5,
 	 5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static float _vq_quantthresh__44u8_p6_1[] = {
+static const float _vq_quantthresh__44u8_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u8_p6_1[] = {
+static const long _vq_quantmap__44u8_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p6_1 = {
-	_vq_quantthresh__44u8_p6_1,
-	_vq_quantmap__44u8_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u8_p6_1 = {
+	(float *)_vq_quantthresh__44u8_p6_1,
+	(long *)_vq_quantmap__44u8_p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u8_p6_1 = {
+static const static_codebook _44u8_p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u8_p6_1,
+	(long *)_vq_lengthlist__44u8_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u8_p6_1,
+	(long *)_vq_quantlist__44u8_p6_1,
 	NULL,
-	&_vq_auxt__44u8_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p7_0[] = {
+static const long _vq_quantlist__44u8_p7_0[] = {
 	6,
 	5,
 	7,
@@ -9471,7 +9471,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u8_p7_0[] = {
+static const long _vq_lengthlist__44u8_p7_0[] = {
 	 1, 4, 5, 6, 6, 7, 7, 8, 8,10,10,11,11, 5, 6, 6,
 	 7, 7, 8, 8, 9, 9,11,10,12,11, 5, 6, 6, 7, 7, 8,
 	 8, 9, 9,10,11,11,12, 6, 7, 7, 8, 8, 9, 9,10,10,
@@ -9485,35 +9485,35 @@
 	13,13,14,14,14,15,15,15,16,
 };
 
-static float _vq_quantthresh__44u8_p7_0[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p7_0[] = {
+static const long _vq_quantmap__44u8_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p7_0 = {
-	_vq_quantthresh__44u8_p7_0,
-	_vq_quantmap__44u8_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p7_0 = {
+	(float *)_vq_quantthresh__44u8_p7_0,
+	(long *)_vq_quantmap__44u8_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44u8_p7_0 = {
+static const static_codebook _44u8_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44u8_p7_0,
+	(long *)_vq_lengthlist__44u8_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__44u8_p7_0,
+	(long *)_vq_quantlist__44u8_p7_0,
 	NULL,
-	&_vq_auxt__44u8_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p7_1[] = {
+static const long _vq_quantlist__44u8_p7_1[] = {
 	5,
 	4,
 	6,
@@ -9527,7 +9527,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u8_p7_1[] = {
+static const long _vq_lengthlist__44u8_p7_1[] = {
 	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7,
 	 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7,
 	 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7,
@@ -9538,35 +9538,35 @@
 	 7, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44u8_p7_1[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p7_1[] = {
+static const long _vq_quantmap__44u8_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p7_1 = {
-	_vq_quantthresh__44u8_p7_1,
-	_vq_quantmap__44u8_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u8_p7_1 = {
+	(float *)_vq_quantthresh__44u8_p7_1,
+	(long *)_vq_quantmap__44u8_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44u8_p7_1 = {
+static const static_codebook _44u8_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44u8_p7_1,
+	(long *)_vq_lengthlist__44u8_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u8_p7_1,
+	(long *)_vq_quantlist__44u8_p7_1,
 	NULL,
-	&_vq_auxt__44u8_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p8_0[] = {
+static const long _vq_quantlist__44u8_p8_0[] = {
 	7,
 	6,
 	8,
@@ -9584,7 +9584,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u8_p8_0[] = {
+static const long _vq_lengthlist__44u8_p8_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8,10, 9,11,10, 4,
 	 6, 6, 8, 8,10, 9, 9, 9,10,10,11,10,12,10, 4, 6,
 	 6, 8, 8,10,10, 9, 9,10,10,11,11,11,12, 7, 8, 8,
@@ -9602,35 +9602,35 @@
 	17,
 };
 
-static float _vq_quantthresh__44u8_p8_0[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p8_0[] = {
+static const long _vq_quantmap__44u8_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p8_0 = {
-	_vq_quantthresh__44u8_p8_0,
-	_vq_quantmap__44u8_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p8_0 = {
+	(float *)_vq_quantthresh__44u8_p8_0,
+	(long *)_vq_quantmap__44u8_p8_0,
 	15,
 	15
 };
 
-static static_codebook _44u8_p8_0 = {
+static const static_codebook _44u8_p8_0 = {
 	2, 225,
-	_vq_lengthlist__44u8_p8_0,
+	(long *)_vq_lengthlist__44u8_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44u8_p8_0,
+	(long *)_vq_quantlist__44u8_p8_0,
 	NULL,
-	&_vq_auxt__44u8_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p8_1[] = {
+static const long _vq_quantlist__44u8_p8_1[] = {
 	10,
 	9,
 	11,
@@ -9654,7 +9654,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44u8_p8_1[] = {
+static const long _vq_lengthlist__44u8_p8_1[] = {
 	 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8,
@@ -9685,37 +9685,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44u8_p8_1[] = {
+static const float _vq_quantthresh__44u8_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__44u8_p8_1[] = {
+static const long _vq_quantmap__44u8_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__44u8_p8_1 = {
-	_vq_quantthresh__44u8_p8_1,
-	_vq_quantmap__44u8_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44u8_p8_1 = {
+	(float *)_vq_quantthresh__44u8_p8_1,
+	(long *)_vq_quantmap__44u8_p8_1,
 	21,
 	21
 };
 
-static static_codebook _44u8_p8_1 = {
+static const static_codebook _44u8_p8_1 = {
 	2, 441,
-	_vq_lengthlist__44u8_p8_1,
+	(long *)_vq_lengthlist__44u8_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44u8_p8_1,
+	(long *)_vq_quantlist__44u8_p8_1,
 	NULL,
-	&_vq_auxt__44u8_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p9_0[] = {
+static const long _vq_quantlist__44u8_p9_0[] = {
 	4,
 	3,
 	5,
@@ -9727,7 +9727,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u8_p9_0[] = {
+static const long _vq_lengthlist__44u8_p9_0[] = {
 	 1, 3, 3, 9, 9, 9, 9, 9, 9, 4, 9, 9, 9, 9, 9, 9,
 	 9, 9, 5, 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,
@@ -9736,34 +9736,34 @@
 	 8,
 };
 
-static float _vq_quantthresh__44u8_p9_0[] = {
+static const float _vq_quantthresh__44u8_p9_0[] = {
 	-3258.5, -2327.5, -1396.5, -465.5, 465.5, 1396.5, 2327.5, 3258.5, 
 };
 
-static long _vq_quantmap__44u8_p9_0[] = {
+static const long _vq_quantmap__44u8_p9_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p9_0 = {
-	_vq_quantthresh__44u8_p9_0,
-	_vq_quantmap__44u8_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44u8_p9_0 = {
+	(float *)_vq_quantthresh__44u8_p9_0,
+	(long *)_vq_quantmap__44u8_p9_0,
 	9,
 	9
 };
 
-static static_codebook _44u8_p9_0 = {
+static const static_codebook _44u8_p9_0 = {
 	2, 81,
-	_vq_lengthlist__44u8_p9_0,
+	(long *)_vq_lengthlist__44u8_p9_0,
 	1, -511895552, 1631393792, 4, 0,
-	_vq_quantlist__44u8_p9_0,
+	(long *)_vq_quantlist__44u8_p9_0,
 	NULL,
-	&_vq_auxt__44u8_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p9_1[] = {
+static const long _vq_quantlist__44u8_p9_1[] = {
 	9,
 	8,
 	10,
@@ -9785,7 +9785,7 @@
 	18,
 };
 
-static long _vq_lengthlist__44u8_p9_1[] = {
+static const long _vq_lengthlist__44u8_p9_1[] = {
 	 1, 4, 4, 7, 7, 8, 7, 8, 6, 9, 7,10, 8,11,10,11,
 	11,11,11, 4, 7, 6, 9, 9,10, 9, 9, 9,10,10,11,10,
 	11,10,11,11,13,11, 4, 7, 7, 9, 9, 9, 9, 9, 9,10,
@@ -9811,37 +9811,37 @@
 	16,15,16,16,16,16,16,16,16,
 };
 
-static float _vq_quantthresh__44u8_p9_1[] = {
+static const float _vq_quantthresh__44u8_p9_1[] = {
 	-416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, 
 	-24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, 
 	367.5, 416.5, 
 };
 
-static long _vq_quantmap__44u8_p9_1[] = {
+static const long _vq_quantmap__44u8_p9_1[] = {
 	   17,   15,   13,   11,    9,    7,    5,    3,
 	    1,    0,    2,    4,    6,    8,   10,   12,
 	   14,   16,   18,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p9_1 = {
-	_vq_quantthresh__44u8_p9_1,
-	_vq_quantmap__44u8_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44u8_p9_1 = {
+	(float *)_vq_quantthresh__44u8_p9_1,
+	(long *)_vq_quantmap__44u8_p9_1,
 	19,
 	19
 };
 
-static static_codebook _44u8_p9_1 = {
+static const static_codebook _44u8_p9_1 = {
 	2, 361,
-	_vq_lengthlist__44u8_p9_1,
+	(long *)_vq_lengthlist__44u8_p9_1,
 	1, -518287360, 1622704128, 5, 0,
-	_vq_quantlist__44u8_p9_1,
+	(long *)_vq_quantlist__44u8_p9_1,
 	NULL,
-	&_vq_auxt__44u8_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u8_p9_2[] = {
+static const long _vq_quantlist__44u8_p9_2[] = {
 	24,
 	23,
 	25,
@@ -9893,14 +9893,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44u8_p9_2[] = {
+static const long _vq_lengthlist__44u8_p9_2[] = {
 	 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7,
 };
 
-static float _vq_quantthresh__44u8_p9_2[] = {
+static const float _vq_quantthresh__44u8_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, 
@@ -9909,7 +9909,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44u8_p9_2[] = {
+static const long _vq_quantmap__44u8_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,
@@ -9919,25 +9919,25 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u8_p9_2 = {
-	_vq_quantthresh__44u8_p9_2,
-	_vq_quantmap__44u8_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44u8_p9_2 = {
+	(float *)_vq_quantthresh__44u8_p9_2,
+	(long *)_vq_quantmap__44u8_p9_2,
 	49,
 	49
 };
 
-static static_codebook _44u8_p9_2 = {
+static const static_codebook _44u8_p9_2 = {
 	1, 49,
-	_vq_lengthlist__44u8_p9_2,
+	(long *)_vq_lengthlist__44u8_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44u8_p9_2,
+	(long *)_vq_quantlist__44u8_p9_2,
 	NULL,
-	&_vq_auxt__44u8_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u8_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44u9__long[] = {
+static const long _huff_lengthlist__44u9__long[] = {
 	 3, 9,13,13,14,15,14,14,15,15, 5, 5, 9,10,12,12,
 	13,14,16,15,10, 6, 6, 6, 8,11,12,13,16,15,11, 7,
 	 5, 3, 5, 8,10,12,15,15,10,10, 7, 4, 3, 5, 8,10,
@@ -9947,9 +9947,9 @@
 	10, 8, 8, 9,
 };
 
-static static_codebook _huff_book__44u9__long = {
+static const static_codebook _huff_book__44u9__long = {
 	2, 100,
-	_huff_lengthlist__44u9__long,
+	(long *)_huff_lengthlist__44u9__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -9958,7 +9958,7 @@
 	0
 };
 
-static long _huff_lengthlist__44u9__short[] = {
+static const long _huff_lengthlist__44u9__short[] = {
 	 9,16,18,18,17,17,17,17,17,17, 5, 8,11,12,11,12,
 	17,17,16,16, 6, 6, 8, 8, 9,10,14,15,16,16, 6, 7,
 	 7, 4, 6, 9,13,16,16,16, 6, 6, 7, 4, 5, 8,11,15,
@@ -9968,9 +9968,9 @@
 	 9, 9,12,15,
 };
 
-static static_codebook _huff_book__44u9__short = {
+static const static_codebook _huff_book__44u9__short = {
 	2, 100,
-	_huff_lengthlist__44u9__short,
+	(long *)_huff_lengthlist__44u9__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -9979,13 +9979,13 @@
 	0
 };
 
-static long _vq_quantlist__44u9_p1_0[] = {
+static const long _vq_quantlist__44u9_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u9_p1_0[] = {
+static const long _vq_lengthlist__44u9_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, 7, 9,
 	 9, 7, 9, 9, 8, 9, 9, 9,10,11, 9,11,11, 7, 9, 9,
@@ -9994,33 +9994,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u9_p1_0[] = {
+static const float _vq_quantthresh__44u9_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44u9_p1_0[] = {
+static const long _vq_quantmap__44u9_p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p1_0 = {
-	_vq_quantthresh__44u9_p1_0,
-	_vq_quantmap__44u9_p1_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p1_0 = {
+	(float *)_vq_quantthresh__44u9_p1_0,
+	(long *)_vq_quantmap__44u9_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44u9_p1_0 = {
+static const static_codebook _44u9_p1_0 = {
 	4, 81,
-	_vq_lengthlist__44u9_p1_0,
+	(long *)_vq_lengthlist__44u9_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44u9_p1_0,
+	(long *)_vq_quantlist__44u9_p1_0,
 	NULL,
-	&_vq_auxt__44u9_p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p2_0[] = {
+static const long _vq_quantlist__44u9_p2_0[] = {
 	2,
 	1,
 	3,
@@ -10028,7 +10028,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44u9_p2_0[] = {
+static const long _vq_lengthlist__44u9_p2_0[] = {
 	 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
 	 9, 9,11,10, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8,
 	 8,10,10, 7, 8, 8, 9,10, 9,10,10,11,11, 9, 9,10,
@@ -10071,33 +10071,33 @@
 	14,
 };
 
-static float _vq_quantthresh__44u9_p2_0[] = {
+static const float _vq_quantthresh__44u9_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u9_p2_0[] = {
+static const long _vq_quantmap__44u9_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p2_0 = {
-	_vq_quantthresh__44u9_p2_0,
-	_vq_quantmap__44u9_p2_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p2_0 = {
+	(float *)_vq_quantthresh__44u9_p2_0,
+	(long *)_vq_quantmap__44u9_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44u9_p2_0 = {
+static const static_codebook _44u9_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44u9_p2_0,
+	(long *)_vq_lengthlist__44u9_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u9_p2_0,
+	(long *)_vq_quantlist__44u9_p2_0,
 	NULL,
-	&_vq_auxt__44u9_p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p3_0[] = {
+static const long _vq_quantlist__44u9_p3_0[] = {
 	4,
 	3,
 	5,
@@ -10109,7 +10109,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44u9_p3_0[] = {
+static const long _vq_lengthlist__44u9_p3_0[] = {
 	 3, 4, 4, 5, 5, 7, 7, 8, 8, 4, 5, 5, 6, 6, 7, 7,
 	 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7,
 	 8, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7,
@@ -10118,34 +10118,34 @@
 	11,
 };
 
-static float _vq_quantthresh__44u9_p3_0[] = {
+static const float _vq_quantthresh__44u9_p3_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44u9_p3_0[] = {
+static const long _vq_quantmap__44u9_p3_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p3_0 = {
-	_vq_quantthresh__44u9_p3_0,
-	_vq_quantmap__44u9_p3_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p3_0 = {
+	(float *)_vq_quantthresh__44u9_p3_0,
+	(long *)_vq_quantmap__44u9_p3_0,
 	9,
 	9
 };
 
-static static_codebook _44u9_p3_0 = {
+static const static_codebook _44u9_p3_0 = {
 	2, 81,
-	_vq_lengthlist__44u9_p3_0,
+	(long *)_vq_lengthlist__44u9_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44u9_p3_0,
+	(long *)_vq_quantlist__44u9_p3_0,
 	NULL,
-	&_vq_auxt__44u9_p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p4_0[] = {
+static const long _vq_quantlist__44u9_p4_0[] = {
 	8,
 	7,
 	9,
@@ -10165,7 +10165,7 @@
 	16,
 };
 
-static long _vq_lengthlist__44u9_p4_0[] = {
+static const long _vq_lengthlist__44u9_p4_0[] = {
 	 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
 	11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,
 	11,11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,
@@ -10187,42 +10187,42 @@
 	14,
 };
 
-static float _vq_quantthresh__44u9_p4_0[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p4_0[] = {
+static const long _vq_quantmap__44u9_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__44u9_p4_0 = {
-	_vq_quantthresh__44u9_p4_0,
-	_vq_quantmap__44u9_p4_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p4_0 = {
+	(float *)_vq_quantthresh__44u9_p4_0,
+	(long *)_vq_quantmap__44u9_p4_0,
 	17,
 	17
 };
 
-static static_codebook _44u9_p4_0 = {
+static const static_codebook _44u9_p4_0 = {
 	2, 289,
-	_vq_lengthlist__44u9_p4_0,
+	(long *)_vq_lengthlist__44u9_p4_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44u9_p4_0,
+	(long *)_vq_quantlist__44u9_p4_0,
 	NULL,
-	&_vq_auxt__44u9_p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p5_0[] = {
+static const long _vq_quantlist__44u9_p5_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44u9_p5_0[] = {
+static const long _vq_lengthlist__44u9_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7,
 	 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10,
 	10, 8,10,10, 7,10,10, 9,10,12, 9,11,11, 7,10,10,
@@ -10231,33 +10231,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44u9_p5_0[] = {
+static const float _vq_quantthresh__44u9_p5_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44u9_p5_0[] = {
+static const long _vq_quantmap__44u9_p5_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p5_0 = {
-	_vq_quantthresh__44u9_p5_0,
-	_vq_quantmap__44u9_p5_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p5_0 = {
+	(float *)_vq_quantthresh__44u9_p5_0,
+	(long *)_vq_quantmap__44u9_p5_0,
 	3,
 	3
 };
 
-static static_codebook _44u9_p5_0 = {
+static const static_codebook _44u9_p5_0 = {
 	4, 81,
-	_vq_lengthlist__44u9_p5_0,
+	(long *)_vq_lengthlist__44u9_p5_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44u9_p5_0,
+	(long *)_vq_quantlist__44u9_p5_0,
 	NULL,
-	&_vq_auxt__44u9_p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p5_1[] = {
+static const long _vq_quantlist__44u9_p5_1[] = {
 	5,
 	4,
 	6,
@@ -10271,7 +10271,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u9_p5_1[] = {
+static const long _vq_lengthlist__44u9_p5_1[] = {
 	 5, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 6,
 	 7, 7, 7, 7, 8, 7, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7,
 	 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 6, 6, 6, 7,
@@ -10282,35 +10282,35 @@
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44u9_p5_1[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p5_1[] = {
+static const long _vq_quantmap__44u9_p5_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p5_1 = {
-	_vq_quantthresh__44u9_p5_1,
-	_vq_quantmap__44u9_p5_1,
+static const encode_aux_threshmatch _vq_auxt__44u9_p5_1 = {
+	(float *)_vq_quantthresh__44u9_p5_1,
+	(long *)_vq_quantmap__44u9_p5_1,
 	11,
 	11
 };
 
-static static_codebook _44u9_p5_1 = {
+static const static_codebook _44u9_p5_1 = {
 	2, 121,
-	_vq_lengthlist__44u9_p5_1,
+	(long *)_vq_lengthlist__44u9_p5_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u9_p5_1,
+	(long *)_vq_quantlist__44u9_p5_1,
 	NULL,
-	&_vq_auxt__44u9_p5_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p5_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p6_0[] = {
+static const long _vq_quantlist__44u9_p6_0[] = {
 	6,
 	5,
 	7,
@@ -10326,7 +10326,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u9_p6_0[] = {
+static const long _vq_lengthlist__44u9_p6_0[] = {
 	 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5,
 	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 5, 6, 7, 7, 8,
 	 8, 8, 8, 9, 9,10,10, 6, 7, 7, 8, 8, 8, 8, 9, 9,
@@ -10340,35 +10340,35 @@
 	10,11,11,11,11,12,11,12,12,
 };
 
-static float _vq_quantthresh__44u9_p6_0[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p6_0[] = {
+static const long _vq_quantmap__44u9_p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p6_0 = {
-	_vq_quantthresh__44u9_p6_0,
-	_vq_quantmap__44u9_p6_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p6_0 = {
+	(float *)_vq_quantthresh__44u9_p6_0,
+	(long *)_vq_quantmap__44u9_p6_0,
 	13,
 	13
 };
 
-static static_codebook _44u9_p6_0 = {
+static const static_codebook _44u9_p6_0 = {
 	2, 169,
-	_vq_lengthlist__44u9_p6_0,
+	(long *)_vq_lengthlist__44u9_p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44u9_p6_0,
+	(long *)_vq_quantlist__44u9_p6_0,
 	NULL,
-	&_vq_auxt__44u9_p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p6_1[] = {
+static const long _vq_quantlist__44u9_p6_1[] = {
 	2,
 	1,
 	3,
@@ -10376,38 +10376,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44u9_p6_1[] = {
+static const long _vq_lengthlist__44u9_p6_1[] = {
 	 4, 4, 4, 5, 5, 4, 5, 4, 5, 5, 4, 4, 5, 5, 5, 5,
 	 5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static float _vq_quantthresh__44u9_p6_1[] = {
+static const float _vq_quantthresh__44u9_p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44u9_p6_1[] = {
+static const long _vq_quantmap__44u9_p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p6_1 = {
-	_vq_quantthresh__44u9_p6_1,
-	_vq_quantmap__44u9_p6_1,
+static const encode_aux_threshmatch _vq_auxt__44u9_p6_1 = {
+	(float *)_vq_quantthresh__44u9_p6_1,
+	(long *)_vq_quantmap__44u9_p6_1,
 	5,
 	5
 };
 
-static static_codebook _44u9_p6_1 = {
+static const static_codebook _44u9_p6_1 = {
 	2, 25,
-	_vq_lengthlist__44u9_p6_1,
+	(long *)_vq_lengthlist__44u9_p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44u9_p6_1,
+	(long *)_vq_quantlist__44u9_p6_1,
 	NULL,
-	&_vq_auxt__44u9_p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p7_0[] = {
+static const long _vq_quantlist__44u9_p7_0[] = {
 	6,
 	5,
 	7,
@@ -10423,7 +10423,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44u9_p7_0[] = {
+static const long _vq_lengthlist__44u9_p7_0[] = {
 	 1, 4, 5, 6, 6, 7, 7, 8, 9,10,10,11,11, 5, 6, 6,
 	 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 6, 7, 7, 8, 8, 9, 9,10,10,
@@ -10437,35 +10437,35 @@
 	12,13,13,14,14,14,15,15,15,
 };
 
-static float _vq_quantthresh__44u9_p7_0[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p7_0[] = {
+static const long _vq_quantmap__44u9_p7_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p7_0 = {
-	_vq_quantthresh__44u9_p7_0,
-	_vq_quantmap__44u9_p7_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p7_0 = {
+	(float *)_vq_quantthresh__44u9_p7_0,
+	(long *)_vq_quantmap__44u9_p7_0,
 	13,
 	13
 };
 
-static static_codebook _44u9_p7_0 = {
+static const static_codebook _44u9_p7_0 = {
 	2, 169,
-	_vq_lengthlist__44u9_p7_0,
+	(long *)_vq_lengthlist__44u9_p7_0,
 	1, -523206656, 1618345984, 4, 0,
-	_vq_quantlist__44u9_p7_0,
+	(long *)_vq_quantlist__44u9_p7_0,
 	NULL,
-	&_vq_auxt__44u9_p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p7_1[] = {
+static const long _vq_quantlist__44u9_p7_1[] = {
 	5,
 	4,
 	6,
@@ -10479,7 +10479,7 @@
 	10,
 };
 
-static long _vq_lengthlist__44u9_p7_1[] = {
+static const long _vq_lengthlist__44u9_p7_1[] = {
 	 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7,
 	 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7,
@@ -10490,35 +10490,35 @@
 	 7, 7, 7, 7, 7, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44u9_p7_1[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p7_1[] = {
+static const long _vq_quantmap__44u9_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p7_1 = {
-	_vq_quantthresh__44u9_p7_1,
-	_vq_quantmap__44u9_p7_1,
+static const encode_aux_threshmatch _vq_auxt__44u9_p7_1 = {
+	(float *)_vq_quantthresh__44u9_p7_1,
+	(long *)_vq_quantmap__44u9_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44u9_p7_1 = {
+static const static_codebook _44u9_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44u9_p7_1,
+	(long *)_vq_lengthlist__44u9_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44u9_p7_1,
+	(long *)_vq_quantlist__44u9_p7_1,
 	NULL,
-	&_vq_auxt__44u9_p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p8_0[] = {
+static const long _vq_quantlist__44u9_p8_0[] = {
 	7,
 	6,
 	8,
@@ -10536,7 +10536,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u9_p8_0[] = {
+static const long _vq_lengthlist__44u9_p8_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,11,10, 4,
 	 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10,12,10, 4, 6,
 	 6, 8, 8, 9,10, 9, 9,10,10,11,11,12,12, 7, 8, 8,
@@ -10554,35 +10554,35 @@
 	15,
 };
 
-static float _vq_quantthresh__44u9_p8_0[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p8_0[] = {
+static const long _vq_quantmap__44u9_p8_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p8_0 = {
-	_vq_quantthresh__44u9_p8_0,
-	_vq_quantmap__44u9_p8_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p8_0 = {
+	(float *)_vq_quantthresh__44u9_p8_0,
+	(long *)_vq_quantmap__44u9_p8_0,
 	15,
 	15
 };
 
-static static_codebook _44u9_p8_0 = {
+static const static_codebook _44u9_p8_0 = {
 	2, 225,
-	_vq_lengthlist__44u9_p8_0,
+	(long *)_vq_lengthlist__44u9_p8_0,
 	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__44u9_p8_0,
+	(long *)_vq_quantlist__44u9_p8_0,
 	NULL,
-	&_vq_auxt__44u9_p8_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p8_1[] = {
+static const long _vq_quantlist__44u9_p8_1[] = {
 	10,
 	9,
 	11,
@@ -10606,7 +10606,7 @@
 	20,
 };
 
-static long _vq_lengthlist__44u9_p8_1[] = {
+static const long _vq_lengthlist__44u9_p8_1[] = {
 	 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8,
@@ -10637,37 +10637,37 @@
 	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44u9_p8_1[] = {
+static const float _vq_quantthresh__44u9_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__44u9_p8_1[] = {
+static const long _vq_quantmap__44u9_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__44u9_p8_1 = {
-	_vq_quantthresh__44u9_p8_1,
-	_vq_quantmap__44u9_p8_1,
+static const encode_aux_threshmatch _vq_auxt__44u9_p8_1 = {
+	(float *)_vq_quantthresh__44u9_p8_1,
+	(long *)_vq_quantmap__44u9_p8_1,
 	21,
 	21
 };
 
-static static_codebook _44u9_p8_1 = {
+static const static_codebook _44u9_p8_1 = {
 	2, 441,
-	_vq_lengthlist__44u9_p8_1,
+	(long *)_vq_lengthlist__44u9_p8_1,
 	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__44u9_p8_1,
+	(long *)_vq_quantlist__44u9_p8_1,
 	NULL,
-	&_vq_auxt__44u9_p8_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p9_0[] = {
+static const long _vq_quantlist__44u9_p9_0[] = {
 	7,
 	6,
 	8,
@@ -10685,7 +10685,7 @@
 	14,
 };
 
-static long _vq_lengthlist__44u9_p9_0[] = {
+static const long _vq_lengthlist__44u9_p9_0[] = {
 	 1, 3, 3,11,11,11,11,11,11,11,11,11,11,11,11, 4,
 	10,11,11,11,11,11,11,11,11,11,11,11,11,11, 4,10,
 	10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -10703,35 +10703,35 @@
 	10,
 };
 
-static float _vq_quantthresh__44u9_p9_0[] = {
+static const float _vq_quantthresh__44u9_p9_0[] = {
 	-6051.5, -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -465.5, 465.5, 
 	1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 6051.5, 
 };
 
-static long _vq_quantmap__44u9_p9_0[] = {
+static const long _vq_quantmap__44u9_p9_0[] = {
 	   13,   11,    9,    7,    5,    3,    1,    0,
 	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p9_0 = {
-	_vq_quantthresh__44u9_p9_0,
-	_vq_quantmap__44u9_p9_0,
+static const encode_aux_threshmatch _vq_auxt__44u9_p9_0 = {
+	(float *)_vq_quantthresh__44u9_p9_0,
+	(long *)_vq_quantmap__44u9_p9_0,
 	15,
 	15
 };
 
-static static_codebook _44u9_p9_0 = {
+static const static_codebook _44u9_p9_0 = {
 	2, 225,
-	_vq_lengthlist__44u9_p9_0,
+	(long *)_vq_lengthlist__44u9_p9_0,
 	1, -510036736, 1631393792, 4, 0,
-	_vq_quantlist__44u9_p9_0,
+	(long *)_vq_quantlist__44u9_p9_0,
 	NULL,
-	&_vq_auxt__44u9_p9_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p9_1[] = {
+static const long _vq_quantlist__44u9_p9_1[] = {
 	9,
 	8,
 	10,
@@ -10753,7 +10753,7 @@
 	18,
 };
 
-static long _vq_lengthlist__44u9_p9_1[] = {
+static const long _vq_lengthlist__44u9_p9_1[] = {
 	 1, 4, 4, 7, 7, 8, 7, 8, 7, 9, 8,10, 9,10,10,11,
 	11,12,12, 4, 7, 6, 9, 9,10, 9, 9, 8,10,10,11,10,
 	12,10,13,12,13,12, 4, 6, 6, 9, 9, 9, 9, 9, 9,10,
@@ -10779,37 +10779,37 @@
 	17,17,15,17,15,17,16,16,17,
 };
 
-static float _vq_quantthresh__44u9_p9_1[] = {
+static const float _vq_quantthresh__44u9_p9_1[] = {
 	-416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, 
 	-24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, 
 	367.5, 416.5, 
 };
 
-static long _vq_quantmap__44u9_p9_1[] = {
+static const long _vq_quantmap__44u9_p9_1[] = {
 	   17,   15,   13,   11,    9,    7,    5,    3,
 	    1,    0,    2,    4,    6,    8,   10,   12,
 	   14,   16,   18,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p9_1 = {
-	_vq_quantthresh__44u9_p9_1,
-	_vq_quantmap__44u9_p9_1,
+static const encode_aux_threshmatch _vq_auxt__44u9_p9_1 = {
+	(float *)_vq_quantthresh__44u9_p9_1,
+	(long *)_vq_quantmap__44u9_p9_1,
 	19,
 	19
 };
 
-static static_codebook _44u9_p9_1 = {
+static const static_codebook _44u9_p9_1 = {
 	2, 361,
-	_vq_lengthlist__44u9_p9_1,
+	(long *)_vq_lengthlist__44u9_p9_1,
 	1, -518287360, 1622704128, 5, 0,
-	_vq_quantlist__44u9_p9_1,
+	(long *)_vq_quantlist__44u9_p9_1,
 	NULL,
-	&_vq_auxt__44u9_p9_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44u9_p9_2[] = {
+static const long _vq_quantlist__44u9_p9_2[] = {
 	24,
 	23,
 	25,
@@ -10861,14 +10861,14 @@
 	48,
 };
 
-static long _vq_lengthlist__44u9_p9_2[] = {
+static const long _vq_lengthlist__44u9_p9_2[] = {
 	 2, 4, 4, 5, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7,
 };
 
-static float _vq_quantthresh__44u9_p9_2[] = {
+static const float _vq_quantthresh__44u9_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, 
@@ -10877,7 +10877,7 @@
 	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
 };
 
-static long _vq_quantmap__44u9_p9_2[] = {
+static const long _vq_quantmap__44u9_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,
@@ -10887,34 +10887,34 @@
 	   48,
 };
 
-static encode_aux_threshmatch _vq_auxt__44u9_p9_2 = {
-	_vq_quantthresh__44u9_p9_2,
-	_vq_quantmap__44u9_p9_2,
+static const encode_aux_threshmatch _vq_auxt__44u9_p9_2 = {
+	(float *)_vq_quantthresh__44u9_p9_2,
+	(long *)_vq_quantmap__44u9_p9_2,
 	49,
 	49
 };
 
-static static_codebook _44u9_p9_2 = {
+static const static_codebook _44u9_p9_2 = {
 	1, 49,
-	_vq_lengthlist__44u9_p9_2,
+	(long *)_vq_lengthlist__44u9_p9_2,
 	1, -526909440, 1611661312, 6, 0,
-	_vq_quantlist__44u9_p9_2,
+	(long *)_vq_quantlist__44u9_p9_2,
 	NULL,
-	&_vq_auxt__44u9_p9_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44u9_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44un1__long[] = {
+static const long _huff_lengthlist__44un1__long[] = {
 	 5, 6,12, 9,14, 9, 9,19, 6, 1, 5, 5, 8, 7, 9,19,
 	12, 4, 4, 7, 7, 9,11,18, 9, 5, 6, 6, 8, 7, 8,17,
 	14, 8, 7, 8, 8,10,12,18, 9, 6, 8, 6, 8, 6, 8,18,
 	 9, 8,11, 8,11, 7, 5,15,16,18,18,18,17,15,11,18,
 };
 
-static static_codebook _huff_book__44un1__long = {
+static const static_codebook _huff_book__44un1__long = {
 	2, 64,
-	_huff_lengthlist__44un1__long,
+	(long *)_huff_lengthlist__44un1__long,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -10923,13 +10923,13 @@
 	0
 };
 
-static long _vq_quantlist__44un1__p1_0[] = {
+static const long _vq_quantlist__44un1__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44un1__p1_0[] = {
+static const long _vq_lengthlist__44un1__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8,
 	10,11, 5, 8, 8, 8,11,10, 8,11,10, 4, 9, 9, 8,11,
 	11, 8,11,11, 8,12,11,10,12,14,11,13,13, 7,11,11,
@@ -10938,39 +10938,39 @@
 	12,
 };
 
-static float _vq_quantthresh__44un1__p1_0[] = {
+static const float _vq_quantthresh__44un1__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44un1__p1_0[] = {
+static const long _vq_quantmap__44un1__p1_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p1_0 = {
-	_vq_quantthresh__44un1__p1_0,
-	_vq_quantmap__44un1__p1_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p1_0 = {
+	(float *)_vq_quantthresh__44un1__p1_0,
+	(long *)_vq_quantmap__44un1__p1_0,
 	3,
 	3
 };
 
-static static_codebook _44un1__p1_0 = {
+static const static_codebook _44un1__p1_0 = {
 	4, 81,
-	_vq_lengthlist__44un1__p1_0,
+	(long *)_vq_lengthlist__44un1__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44un1__p1_0,
+	(long *)_vq_quantlist__44un1__p1_0,
 	NULL,
-	&_vq_auxt__44un1__p1_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p2_0[] = {
+static const long _vq_quantlist__44un1__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44un1__p2_0[] = {
+static const long _vq_lengthlist__44un1__p2_0[] = {
 	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6,
 	 7, 9, 5, 7, 7, 6, 8, 7, 7, 9, 8, 4, 7, 7, 7, 9,
 	 8, 7, 8, 8, 7, 9, 8, 8, 8,10, 9,10,10, 6, 8, 8,
@@ -10979,33 +10979,33 @@
 	 8,
 };
 
-static float _vq_quantthresh__44un1__p2_0[] = {
+static const float _vq_quantthresh__44un1__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44un1__p2_0[] = {
+static const long _vq_quantmap__44un1__p2_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p2_0 = {
-	_vq_quantthresh__44un1__p2_0,
-	_vq_quantmap__44un1__p2_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p2_0 = {
+	(float *)_vq_quantthresh__44un1__p2_0,
+	(long *)_vq_quantmap__44un1__p2_0,
 	3,
 	3
 };
 
-static static_codebook _44un1__p2_0 = {
+static const static_codebook _44un1__p2_0 = {
 	4, 81,
-	_vq_lengthlist__44un1__p2_0,
+	(long *)_vq_lengthlist__44un1__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44un1__p2_0,
+	(long *)_vq_quantlist__44un1__p2_0,
 	NULL,
-	&_vq_auxt__44un1__p2_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p3_0[] = {
+static const long _vq_quantlist__44un1__p3_0[] = {
 	2,
 	1,
 	3,
@@ -11013,7 +11013,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44un1__p3_0[] = {
+static const long _vq_lengthlist__44un1__p3_0[] = {
 	 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9,
 	10, 9,12,12, 9, 9,10,11,12, 6, 8, 8,10,10, 8,10,
 	10,11,11, 8, 9,10,11,11,10,11,11,13,13,10,11,11,
@@ -11056,33 +11056,33 @@
 	17,
 };
 
-static float _vq_quantthresh__44un1__p3_0[] = {
+static const float _vq_quantthresh__44un1__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44un1__p3_0[] = {
+static const long _vq_quantmap__44un1__p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p3_0 = {
-	_vq_quantthresh__44un1__p3_0,
-	_vq_quantmap__44un1__p3_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p3_0 = {
+	(float *)_vq_quantthresh__44un1__p3_0,
+	(long *)_vq_quantmap__44un1__p3_0,
 	5,
 	5
 };
 
-static static_codebook _44un1__p3_0 = {
+static const static_codebook _44un1__p3_0 = {
 	4, 625,
-	_vq_lengthlist__44un1__p3_0,
+	(long *)_vq_lengthlist__44un1__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44un1__p3_0,
+	(long *)_vq_quantlist__44un1__p3_0,
 	NULL,
-	&_vq_auxt__44un1__p3_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p4_0[] = {
+static const long _vq_quantlist__44un1__p4_0[] = {
 	2,
 	1,
 	3,
@@ -11090,7 +11090,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44un1__p4_0[] = {
+static const long _vq_lengthlist__44un1__p4_0[] = {
 	 3, 5, 5, 9, 9, 5, 6, 6,10, 9, 5, 6, 6, 9,10,10,
 	10,10,12,11, 9,10,10,12,12, 5, 7, 7,10,10, 7, 7,
 	 8,10,11, 7, 7, 8,10,11,10,10,11,11,13,10,10,11,
@@ -11133,33 +11133,33 @@
 	12,
 };
 
-static float _vq_quantthresh__44un1__p4_0[] = {
+static const float _vq_quantthresh__44un1__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44un1__p4_0[] = {
+static const long _vq_quantmap__44un1__p4_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p4_0 = {
-	_vq_quantthresh__44un1__p4_0,
-	_vq_quantmap__44un1__p4_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p4_0 = {
+	(float *)_vq_quantthresh__44un1__p4_0,
+	(long *)_vq_quantmap__44un1__p4_0,
 	5,
 	5
 };
 
-static static_codebook _44un1__p4_0 = {
+static const static_codebook _44un1__p4_0 = {
 	4, 625,
-	_vq_lengthlist__44un1__p4_0,
+	(long *)_vq_lengthlist__44un1__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44un1__p4_0,
+	(long *)_vq_quantlist__44un1__p4_0,
 	NULL,
-	&_vq_auxt__44un1__p4_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p5_0[] = {
+static const long _vq_quantlist__44un1__p5_0[] = {
 	4,
 	3,
 	5,
@@ -11171,7 +11171,7 @@
 	8,
 };
 
-static long _vq_lengthlist__44un1__p5_0[] = {
+static const long _vq_lengthlist__44un1__p5_0[] = {
 	 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 7, 8, 8,
 	10, 9, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 7, 9, 9,
 	 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 8, 8, 8,
@@ -11180,34 +11180,34 @@
 	12,
 };
 
-static float _vq_quantthresh__44un1__p5_0[] = {
+static const float _vq_quantthresh__44un1__p5_0[] = {
 	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
-static long _vq_quantmap__44un1__p5_0[] = {
+static const long _vq_quantmap__44un1__p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p5_0 = {
-	_vq_quantthresh__44un1__p5_0,
-	_vq_quantmap__44un1__p5_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p5_0 = {
+	(float *)_vq_quantthresh__44un1__p5_0,
+	(long *)_vq_quantmap__44un1__p5_0,
 	9,
 	9
 };
 
-static static_codebook _44un1__p5_0 = {
+static const static_codebook _44un1__p5_0 = {
 	2, 81,
-	_vq_lengthlist__44un1__p5_0,
+	(long *)_vq_lengthlist__44un1__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44un1__p5_0,
+	(long *)_vq_quantlist__44un1__p5_0,
 	NULL,
-	&_vq_auxt__44un1__p5_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p6_0[] = {
+static const long _vq_quantlist__44un1__p6_0[] = {
 	6,
 	5,
 	7,
@@ -11223,7 +11223,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44un1__p6_0[] = {
+static const long _vq_lengthlist__44un1__p6_0[] = {
 	 1, 4, 4, 6, 6, 8, 8,10,10,11,11,15,15, 4, 5, 5,
 	 8, 8, 9, 9,11,11,12,12,16,16, 4, 5, 6, 8, 8, 9,
 	 9,11,11,12,12,14,14, 7, 8, 8, 9, 9,10,10,11,12,
@@ -11237,35 +11237,35 @@
 	16, 0,15,18,18, 0,16, 0, 0,
 };
 
-static float _vq_quantthresh__44un1__p6_0[] = {
+static const float _vq_quantthresh__44un1__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__44un1__p6_0[] = {
+static const long _vq_quantmap__44un1__p6_0[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p6_0 = {
-	_vq_quantthresh__44un1__p6_0,
-	_vq_quantmap__44un1__p6_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p6_0 = {
+	(float *)_vq_quantthresh__44un1__p6_0,
+	(long *)_vq_quantmap__44un1__p6_0,
 	13,
 	13
 };
 
-static static_codebook _44un1__p6_0 = {
+static const static_codebook _44un1__p6_0 = {
 	2, 169,
-	_vq_lengthlist__44un1__p6_0,
+	(long *)_vq_lengthlist__44un1__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44un1__p6_0,
+	(long *)_vq_quantlist__44un1__p6_0,
 	NULL,
-	&_vq_auxt__44un1__p6_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p6_1[] = {
+static const long _vq_quantlist__44un1__p6_1[] = {
 	2,
 	1,
 	3,
@@ -11273,38 +11273,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44un1__p6_1[] = {
+static const long _vq_lengthlist__44un1__p6_1[] = {
 	 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 6, 5, 5,
 	 6, 5, 6, 6, 5, 6, 6, 6, 6,
 };
 
-static float _vq_quantthresh__44un1__p6_1[] = {
+static const float _vq_quantthresh__44un1__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44un1__p6_1[] = {
+static const long _vq_quantmap__44un1__p6_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p6_1 = {
-	_vq_quantthresh__44un1__p6_1,
-	_vq_quantmap__44un1__p6_1,
+static const encode_aux_threshmatch _vq_auxt__44un1__p6_1 = {
+	(float *)_vq_quantthresh__44un1__p6_1,
+	(long *)_vq_quantmap__44un1__p6_1,
 	5,
 	5
 };
 
-static static_codebook _44un1__p6_1 = {
+static const static_codebook _44un1__p6_1 = {
 	2, 25,
-	_vq_lengthlist__44un1__p6_1,
+	(long *)_vq_lengthlist__44un1__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44un1__p6_1,
+	(long *)_vq_quantlist__44un1__p6_1,
 	NULL,
-	&_vq_auxt__44un1__p6_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p7_0[] = {
+static const long _vq_quantlist__44un1__p7_0[] = {
 	2,
 	1,
 	3,
@@ -11312,7 +11312,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44un1__p7_0[] = {
+static const long _vq_lengthlist__44un1__p7_0[] = {
 	 1, 5, 3,11,11,11,11,11,11,11, 8,11,11,11,11,11,
 	11,11,11,11,11,11,11,11,11,10,11,11,11,11,11,11,
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
@@ -11355,33 +11355,33 @@
 	10,
 };
 
-static float _vq_quantthresh__44un1__p7_0[] = {
+static const float _vq_quantthresh__44un1__p7_0[] = {
 	-253.5, -84.5, 84.5, 253.5, 
 };
 
-static long _vq_quantmap__44un1__p7_0[] = {
+static const long _vq_quantmap__44un1__p7_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p7_0 = {
-	_vq_quantthresh__44un1__p7_0,
-	_vq_quantmap__44un1__p7_0,
+static const encode_aux_threshmatch _vq_auxt__44un1__p7_0 = {
+	(float *)_vq_quantthresh__44un1__p7_0,
+	(long *)_vq_quantmap__44un1__p7_0,
 	5,
 	5
 };
 
-static static_codebook _44un1__p7_0 = {
+static const static_codebook _44un1__p7_0 = {
 	4, 625,
-	_vq_lengthlist__44un1__p7_0,
+	(long *)_vq_lengthlist__44un1__p7_0,
 	1, -518709248, 1626677248, 3, 0,
-	_vq_quantlist__44un1__p7_0,
+	(long *)_vq_quantlist__44un1__p7_0,
 	NULL,
-	&_vq_auxt__44un1__p7_0,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p7_1[] = {
+static const long _vq_quantlist__44un1__p7_1[] = {
 	6,
 	5,
 	7,
@@ -11397,7 +11397,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44un1__p7_1[] = {
+static const long _vq_lengthlist__44un1__p7_1[] = {
 	 1, 4, 4, 6, 6, 6, 6, 9, 8, 9, 8, 8, 8, 5, 7, 7,
 	 7, 7, 8, 8, 8,10, 8,10, 8, 9, 5, 7, 7, 8, 7, 7,
 	 8,10,10,11,10,12,11, 7, 8, 8, 9, 9, 9,10,11,11,
@@ -11411,35 +11411,35 @@
 	12,13,13,12,13,13,14,14,14,
 };
 
-static float _vq_quantthresh__44un1__p7_1[] = {
+static const float _vq_quantthresh__44un1__p7_1[] = {
 	-71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, 
 	32.5, 45.5, 58.5, 71.5, 
 };
 
-static long _vq_quantmap__44un1__p7_1[] = {
+static const long _vq_quantmap__44un1__p7_1[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p7_1 = {
-	_vq_quantthresh__44un1__p7_1,
-	_vq_quantmap__44un1__p7_1,
+static const encode_aux_threshmatch _vq_auxt__44un1__p7_1 = {
+	(float *)_vq_quantthresh__44un1__p7_1,
+	(long *)_vq_quantmap__44un1__p7_1,
 	13,
 	13
 };
 
-static static_codebook _44un1__p7_1 = {
+static const static_codebook _44un1__p7_1 = {
 	2, 169,
-	_vq_lengthlist__44un1__p7_1,
+	(long *)_vq_lengthlist__44un1__p7_1,
 	1, -523010048, 1618608128, 4, 0,
-	_vq_quantlist__44un1__p7_1,
+	(long *)_vq_quantlist__44un1__p7_1,
 	NULL,
-	&_vq_auxt__44un1__p7_1,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44un1__p7_2[] = {
+static const long _vq_quantlist__44un1__p7_2[] = {
 	6,
 	5,
 	7,
@@ -11455,7 +11455,7 @@
 	12,
 };
 
-static long _vq_lengthlist__44un1__p7_2[] = {
+static const long _vq_lengthlist__44un1__p7_2[] = {
 	 3, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 8, 4, 5, 5,
 	 6, 6, 8, 8, 9, 8, 9, 9, 9, 9, 4, 5, 5, 7, 6, 8,
 	 8, 8, 8, 9, 8, 9, 8, 6, 7, 7, 7, 8, 8, 8, 9, 9,
@@ -11469,44 +11469,44 @@
 	 9, 9, 9,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44un1__p7_2[] = {
+static const float _vq_quantthresh__44un1__p7_2[] = {
 	-5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 
 	2.5, 3.5, 4.5, 5.5, 
 };
 
-static long _vq_quantmap__44un1__p7_2[] = {
+static const long _vq_quantmap__44un1__p7_2[] = {
 	   11,    9,    7,    5,    3,    1,    0,    2,
 	    4,    6,    8,   10,   12,
 };
 
-static encode_aux_threshmatch _vq_auxt__44un1__p7_2 = {
-	_vq_quantthresh__44un1__p7_2,
-	_vq_quantmap__44un1__p7_2,
+static const encode_aux_threshmatch _vq_auxt__44un1__p7_2 = {
+	(float *)_vq_quantthresh__44un1__p7_2,
+	(long *)_vq_quantmap__44un1__p7_2,
 	13,
 	13
 };
 
-static static_codebook _44un1__p7_2 = {
+static const static_codebook _44un1__p7_2 = {
 	2, 169,
-	_vq_lengthlist__44un1__p7_2,
+	(long *)_vq_lengthlist__44un1__p7_2,
 	1, -531103744, 1611661312, 4, 0,
-	_vq_quantlist__44un1__p7_2,
+	(long *)_vq_quantlist__44un1__p7_2,
 	NULL,
-	&_vq_auxt__44un1__p7_2,
+	(encode_aux_threshmatch *)&_vq_auxt__44un1__p7_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44un1__short[] = {
+static const long _huff_lengthlist__44un1__short[] = {
 	12,12,14,12,14,14,14,14,12, 6, 6, 8, 9, 9,11,14,
 	12, 4, 2, 6, 6, 7,11,14,13, 6, 5, 7, 8, 9,11,14,
 	13, 8, 5, 8, 6, 8,12,14,12, 7, 7, 8, 8, 8,10,14,
 	12, 6, 3, 4, 4, 4, 7,14,11, 7, 4, 6, 6, 6, 8,14,
 };
 
-static static_codebook _huff_book__44un1__short = {
+static const static_codebook _huff_book__44un1__short = {
 	2, 64,
-	_huff_lengthlist__44un1__short,
+	(long *)_huff_lengthlist__44un1__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,

Modified: trunk/vorbis/lib/floor0.c
===================================================================
--- trunk/vorbis/lib/floor0.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/floor0.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -214,7 +214,7 @@
 }
 
 /* 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
 };

Modified: trunk/vorbis/lib/floor1.c
===================================================================
--- trunk/vorbis/lib/floor1.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/floor1.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -1061,7 +1061,7 @@
 }
 
 /* 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
 };

Modified: trunk/vorbis/lib/highlevel.h
===================================================================
--- trunk/vorbis/lib/highlevel.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/highlevel.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -23,7 +23,7 @@
 } highlevel_byblocktype;
   
 typedef struct highlevel_encode_setup {
-  void *setup;
+  const void *setup;
   int   set_in_stone;
 
   double base_setting;

Modified: trunk/vorbis/lib/mapping0.c
===================================================================
--- trunk/vorbis/lib/mapping0.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/mapping0.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -852,7 +852,7 @@
 }
 
 /* export hooks */
-vorbis_func_mapping mapping0_exportbundle={
+const vorbis_func_mapping mapping0_exportbundle={
   &mapping0_pack,
   &mapping0_unpack,
   &mapping0_free_info,

Modified: trunk/vorbis/lib/masking.h
===================================================================
--- trunk/vorbis/lib/masking.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/masking.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
 /* (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, 

Modified: trunk/vorbis/lib/modes/floor_all.h
===================================================================
--- trunk/vorbis/lib/modes/floor_all.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/floor_all.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   &_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 @@
   &_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 @@
   &_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 @@
   &_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 @@
   &_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 @@
   &_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 @@
   &_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 @@
   _floor_512x17_books,
 };
 
-static vorbis_info_floor1 _floor[10]={
+static const vorbis_info_floor1 _floor[10]={
   /* 128 x 4 */
   {
     1,{0},{4},{2},{0},

Modified: trunk/vorbis/lib/modes/psych_11.h
===================================================================
--- trunk/vorbis/lib/modes/psych_11.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/psych_11.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 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 @@
     {-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 };
 

Modified: trunk/vorbis/lib/modes/psych_16.h
===================================================================
--- trunk/vorbis/lib/modes/psych_16.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/psych_16.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
    { 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 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 @@
     {-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 @@
     {-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 @@
     {-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,
 };
 

Modified: trunk/vorbis/lib/modes/psych_44.h
===================================================================
--- trunk/vorbis/lib/modes/psych_44.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/psych_44.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
 };
 
 /* 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 @@
 
 /* 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 @@
    {{-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 @@
 };
 
 /* 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 @@
 };
 
 /*  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 @@
 };
 
 /* 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 @@
 };
 
 /* 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 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 @@
 
 /* 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 @@
 /* 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 @@
 };
 
 /* 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 @@
 };
 
 /* 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,
 };

Modified: trunk/vorbis/lib/modes/psych_8.h
===================================================================
--- trunk/vorbis/lib/modes/psych_8.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/psych_8.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 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 @@
 };
 
 /* 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 @@
    { 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 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,
 };
 

Modified: trunk/vorbis/lib/modes/residue_16.h
===================================================================
--- trunk/vorbis/lib/modes/residue_16.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/residue_16.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
     {&_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 @@
     {&_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 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 @@
    &_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 @@
    &_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 @@
     {&_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 @@
     {&_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 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 @@
    &_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_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 */

Modified: trunk/vorbis/lib/modes/residue_44.h
===================================================================
--- trunk/vorbis/lib/modes/residue_44.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/residue_44.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   {  .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 @@
   {  .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 @@
   {  .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 @@
     {&_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_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 @@
     {&_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_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 @@
     {&_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_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 */

Modified: trunk/vorbis/lib/modes/residue_44u.h
===================================================================
--- trunk/vorbis/lib/modes/residue_44u.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/residue_44u.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   {  -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 @@
   {  -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 @@
 /* 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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 @@
     {&_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 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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 @@
    &_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 */

Modified: trunk/vorbis/lib/modes/residue_8.h
===================================================================
--- trunk/vorbis/lib/modes/residue_8.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/residue_8.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
     {&_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 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 @@
     {&_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 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 */
 };

Modified: trunk/vorbis/lib/modes/setup_11.h
===================================================================
--- trunk/vorbis/lib/modes/setup_11.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_11.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   _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,

Modified: trunk/vorbis/lib/modes/setup_16.h
===================================================================
--- trunk/vorbis/lib/modes/setup_16.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_16.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   _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,

Modified: trunk/vorbis/lib/modes/setup_22.h
===================================================================
--- trunk/vorbis/lib/modes/setup_22.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_22.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   _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,

Modified: trunk/vorbis/lib/modes/setup_32.h
===================================================================
--- trunk/vorbis/lib/modes/setup_32.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_32.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   _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,

Modified: trunk/vorbis/lib/modes/setup_44.h
===================================================================
--- trunk/vorbis/lib/modes/setup_44.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_44.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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,

Modified: trunk/vorbis/lib/modes/setup_44u.h
===================================================================
--- trunk/vorbis/lib/modes/setup_44u.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_44u.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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,

Modified: trunk/vorbis/lib/modes/setup_8.h
===================================================================
--- trunk/vorbis/lib/modes/setup_8.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_8.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   _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,

Modified: trunk/vorbis/lib/modes/setup_X.h
===================================================================
--- trunk/vorbis/lib/modes/setup_X.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/modes/setup_X.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   _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 @@
   _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 @@
   _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,

Modified: trunk/vorbis/lib/registry.c
===================================================================
--- trunk/vorbis/lib/registry.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/registry.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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,
 };
 

Modified: trunk/vorbis/lib/registry.h
===================================================================
--- trunk/vorbis/lib/registry.h	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/registry.h	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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

Modified: trunk/vorbis/lib/res0.c
===================================================================
--- trunk/vorbis/lib/res0.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/res0.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -894,7 +894,7 @@
 }
 
 
-vorbis_func_residue residue0_exportbundle={
+const vorbis_func_residue residue0_exportbundle={
   NULL,
   &res0_unpack,
   &res0_look,
@@ -905,7 +905,7 @@
   &res0_inverse
 };
 
-vorbis_func_residue residue1_exportbundle={
+const vorbis_func_residue residue1_exportbundle={
   &res0_pack,
   &res0_unpack,
   &res0_look,
@@ -916,7 +916,7 @@
   &res1_inverse
 };
 
-vorbis_func_residue residue2_exportbundle={
+const vorbis_func_residue residue2_exportbundle={
   &res0_pack,
   &res0_unpack,
   &res0_look,

Modified: trunk/vorbis/lib/vorbisenc.c
===================================================================
--- trunk/vorbis/lib/vorbisenc.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/vorbisenc.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -32,22 +32,22 @@
    with > 12 partition types, or a different division of iteration,
    this needs to be updated. */
 typedef struct {
-  static_codebook *books[12][3];
+  const static_codebook *books[12][3];
 } static_bookblock;
 
 typedef struct {
   int res_type;
   int limit_type; /* 0 lowpass limited, 1 point stereo limited */
-  vorbis_info_residue0 *res;
-  static_codebook  *book_aux;
-  static_codebook  *book_aux_managed;
-  static_bookblock *books_base;
-  static_bookblock *books_base_managed;
+  const vorbis_info_residue0 *res;
+  const static_codebook  *book_aux;
+  const static_codebook  *book_aux_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 {
   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;
+  const att3    *psy_tone_masteratt;
+  const int     *psy_tone_0dB;
+  const int     *psy_tone_dBsuppress;
 
-  vp_adjblock *psy_tone_adj_impulse;
-  vp_adjblock *psy_tone_adj_long;
-  vp_adjblock *psy_tone_adj_other;
+  const vp_adjblock *psy_tone_adj_impulse;
+  const vp_adjblock *psy_tone_adj_long;
+  const 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;
+  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;
 
-  compandblock  *psy_noise_compand;
-  double        *psy_noise_compand_short_mapping;
-  double        *psy_noise_compand_long_mapping;
+  const compandblock  *psy_noise_compand;
+  const double        *psy_noise_compand_short_mapping;
+  const double        *psy_noise_compand_long_mapping;
 
-  int      *psy_noise_normal_start[2];
-  int      *psy_noise_normal_partition[2];
-  double   *psy_noise_normal_thresh;
+  const int      *psy_noise_normal_start[2];
+  const int      *psy_noise_normal_partition[2];
+  const double   *psy_noise_normal_thresh;
 
-  int      *psy_ath_float;
-  int      *psy_ath_abs;
+  const int      *psy_ath_float;
+  const int      *psy_ath_abs;
 
-  double   *psy_lowpass;
+  const double   *psy_lowpass;
 
-  vorbis_info_psy_global *global_params;
-  double     *global_mapping;
-  adj_stereo *stereo_modes;
+  const vorbis_info_psy_global *global_params;
+  const double     *global_mapping;
+  const adj_stereo *stereo_modes;
 
-  static_codebook ***floor_books;
-  vorbis_info_floor1 *floor_params;
-  int *floor_short_mapping;
-  int *floor_long_mapping;
+  const static_codebook *const *const *const 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 @@
 #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 void vorbis_encode_floor_setup(vorbis_info *vi,double s,int block,
-				     static_codebook    ***books, 
-				     vorbis_info_floor1 *in, 
-				     int *x){
+				     const static_codebook *const *const *const 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;
@@ -225,7 +225,7 @@
     }
 
     for(i=0;i<=maxbook;i++)
-      ci->book_param[ci->books++]=books[x[is]][i];
+      ci->book_param[ci->books++]=(static_codebook *)books[x[is]][i];
   }
 
   /* for now, we're only using floor 1 */
@@ -237,8 +237,8 @@
 }
 
 static void vorbis_encode_global_psych_setup(vorbis_info *vi,double s,
-					    vorbis_info_psy_global *in, 
-					    double *x){
+					    const vorbis_info_psy_global *in, 
+					    const double *x){
   int i,is=s;
   double ds=s-is;
   codec_setup_info *ci=vi->codec_setup;
@@ -264,8 +264,8 @@
 }
 
 static void vorbis_encode_global_stereo(vorbis_info *vi,
-				       highlevel_encode_setup *hi,
-				       adj_stereo *p){
+					const highlevel_encode_setup *const hi,
+					const adj_stereo *p){
   float s=hi->stereo_point_setting;
   int i,is=s;
   double ds=s-is;
@@ -313,10 +313,10 @@
 }
 
 static void vorbis_encode_psyset_setup(vorbis_info *vi,double s,
-				      int *nn_start,
-				      int *nn_partition,
-				      double *nn_thresh,
-				      int block){
+				       const int *nn_start,
+				       const int *nn_partition,
+				       const double *nn_thresh,
+				       int block){
   codec_setup_info *ci=vi->codec_setup;
   vorbis_info_psy *p=ci->psy_param[block];
   highlevel_encode_setup *hi=&ci->hi;
@@ -344,9 +344,9 @@
 }
 
 static void vorbis_encode_tonemask_setup(vorbis_info *vi,double s,int block,
-					 att3 *att,
-					 int  *max,
-					 vp_adjblock *in){
+					 const att3 *att,
+					 const int  *max,
+					 const vp_adjblock *in){
   int i,is=s;
   double ds=s-is;
   codec_setup_info *ci=vi->codec_setup;
@@ -369,7 +369,8 @@
 
 
 static void vorbis_encode_compand_setup(vorbis_info *vi,double s,int block,
-				       compandblock *in, double *x){
+					const compandblock *in, 
+					const double *x){
   int i,is=s;
   double ds=s-is;
   codec_setup_info *ci=vi->codec_setup;
@@ -390,7 +391,7 @@
 }
 
 static void vorbis_encode_peak_setup(vorbis_info *vi,double s,int block,
-				    int *suppress){
+				    const int *suppress){
   int is=s;
   double ds=s-is;
   codec_setup_info *ci=vi->codec_setup;
@@ -402,9 +403,9 @@
 }
 
 static void vorbis_encode_noisebias_setup(vorbis_info *vi,double s,int block,
-					 int *suppress,
-					 noise3 *in,
-					 noiseguard *guard,
+					 const int *suppress,
+					 const noise3 *in,
+					 const noiseguard *guard,
 					 double userbias){
   int i,is=s,j;
   double ds=s-is;
@@ -443,7 +444,7 @@
 }
 
 
-static int book_dup_or_new(codec_setup_info *ci,static_codebook *book){
+static int book_dup_or_new(codec_setup_info *ci,const static_codebook *book){
   int i;
   for(i=0;i<ci->books;i++)
     if(ci->book_param[i]==book)return(i);
@@ -452,7 +453,7 @@
 }
 
 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;
@@ -465,8 +466,8 @@
 }
 
 static void vorbis_encode_residue_setup(vorbis_info *vi,
-				       int number, int block,
-				       vorbis_residue_template *res){
+					int number, int block,
+					const vorbis_residue_template *res){
 
   codec_setup_info *ci=vi->codec_setup;
   int i,n;
@@ -503,14 +504,14 @@
 	    r->secondstages[i]|=(1<<k);
 
       r->groupbook=book_dup_or_new(ci,res->book_aux_managed);
-      ci->book_param[r->groupbook]=res->book_aux_managed;      
+      ci->book_param[r->groupbook]=(static_codebook *)res->book_aux_managed;      
     
       for(i=0;i<r->partitions;i++){
 	for(k=0;k<3;k++){
 	  if(res->books_base_managed->books[i][k]){
 	    int bookid=book_dup_or_new(ci,res->books_base_managed->books[i][k]);
 	    r->booklist[booklist++]=bookid;
-	    ci->book_param[bookid]=res->books_base_managed->books[i][k];
+	    ci->book_param[bookid]=(static_codebook *)res->books_base_managed->books[i][k];
 	  }
 	}
       }
@@ -523,14 +524,14 @@
 	    r->secondstages[i]|=(1<<k);
   
       r->groupbook=book_dup_or_new(ci,res->book_aux);
-      ci->book_param[r->groupbook]=res->book_aux;
+      ci->book_param[r->groupbook]=(static_codebook *)res->book_aux;
       
       for(i=0;i<r->partitions;i++){
 	for(k=0;k<3;k++){
 	  if(res->books_base->books[i][k]){
 	    int bookid=book_dup_or_new(ci,res->books_base->books[i][k]);
 	    r->booklist[booklist++]=bookid;
-	    ci->book_param[bookid]=res->books_base->books[i][k];
+	    ci->book_param[bookid]=(static_codebook *)res->books_base->books[i][k];
 	  }
 	}
       }
@@ -576,13 +577,13 @@
 
 /* we assume two maps in this encoder */
 static void vorbis_encode_map_n_res_setup(vorbis_info *vi,double s,
-					  vorbis_mapping_template *maps){
+					  const vorbis_mapping_template *maps){
 
   codec_setup_info *ci=vi->codec_setup;
   int i,j,is=s,modes=2;
-  vorbis_info_mapping0 *map=maps[is].map;
-  vorbis_info_mode *mode=_mode_template;
-  vorbis_residue_template *res=maps[is].res;
+  const vorbis_info_mapping0 *map=maps[is].map;
+  const vorbis_info_mode *mode=_mode_template;
+  const vorbis_residue_template *res=maps[is].res;
 
   if(ci->blocksizes[0]==ci->blocksizes[1])modes=1;
 
@@ -611,7 +612,7 @@
   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 +634,7 @@
       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 +861,7 @@
   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);

Modified: trunk/vorbis/lib/window.c
===================================================================
--- trunk/vorbis/lib/window.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/lib/window.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   vwin8192,
 };
 
-float *_vorbis_window_get(int n){
+const float *_vorbis_window_get(int n){
   return vwin[n];
 }
 
@@ -2105,8 +2105,8 @@
   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];

Modified: trunk/vorbis/vq/bookutil.c
===================================================================
--- trunk/vorbis/vq/bookutil.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/vq/bookutil.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -191,7 +191,7 @@
   }
 
   /* find the codebook struct */
-  find_seek_to(in,"static static_codebook ");
+  find_seek_to(in,"static const static_codebook ");
 
   /* get the major important values */
   line=get_line(in);
@@ -210,7 +210,7 @@
   }
   
   /* find the auxiliary encode struct[s] (if any) */
-  if(find_seek_to(in,"static encode_aux_nearestmatch _vq_aux")){
+  if(find_seek_to(in,"static const encode_aux_nearestmatch _vq_aux")){
     /* how big? */
     c->nearest_tree=a=_ogg_calloc(1,sizeof(encode_aux_nearestmatch));
     line=get_line(in);
@@ -224,7 +224,7 @@
     }
 
     /* load ptr0 */
-    find_seek_to(in,"static long _vq_ptr0");
+    find_seek_to(in,"static const long _vq_ptr0");
     reset_next_value();
     a->ptr0=_ogg_malloc(sizeof(long)*a->aux);
     for(i=0;i<a->aux;i++)
@@ -234,7 +234,7 @@
       }
     
     /* load ptr1 */
-    find_seek_to(in,"static long _vq_ptr1");
+    find_seek_to(in,"static const long _vq_ptr1");
     reset_next_value();
     a->ptr1=_ogg_malloc(sizeof(long)*a->aux);
     for(i=0;i<a->aux;i++)
@@ -245,7 +245,7 @@
     
     
     /* load p */
-    find_seek_to(in,"static long _vq_p_");
+    find_seek_to(in,"static const long _vq_p_");
     reset_next_value();
     a->p=_ogg_malloc(sizeof(long)*a->aux);
     for(i=0;i<a->aux;i++)
@@ -255,7 +255,7 @@
       }
     
     /* load q */
-    find_seek_to(in,"static long _vq_q_");
+    find_seek_to(in,"static const long _vq_q_");
     reset_next_value();
     a->q=_ogg_malloc(sizeof(long)*a->aux);
     for(i=0;i<a->aux;i++)
@@ -265,7 +265,7 @@
       }    
   }
   
-  if(find_seek_to(in,"static encode_aux_threshmatch _vq_aux")){
+  if(find_seek_to(in,"static const encode_aux_threshmatch _vq_aux")){
     /* how big? */
     c->thresh_tree=t=_ogg_calloc(1,sizeof(encode_aux_threshmatch));
     line=get_line(in);
@@ -281,7 +281,7 @@
       exit(1);
     }
     /* load quantthresh */
-    find_seek_to(in,"static float _vq_quantthresh_");
+    find_seek_to(in,"static const float _vq_quantthresh_");
     reset_next_value();
     t->quantthresh=_ogg_malloc(sizeof(float)*t->threshvals);
     for(i=0;i<t->threshvals-1;i++)
@@ -290,7 +290,7 @@
 	exit(1);
       }    
     /* load quantmap */
-    find_seek_to(in,"static long _vq_quantmap_");
+    find_seek_to(in,"static const long _vq_quantmap_");
     reset_next_value();
     t->quantmap=_ogg_malloc(sizeof(long)*t->threshvals);
     for(i=0;i<t->threshvals;i++)
@@ -300,7 +300,7 @@
       }    
   }
     
-  if(find_seek_to(in,"static encode_aux_pigeonhole _vq_aux")){
+  if(find_seek_to(in,"static const encode_aux_pigeonhole _vq_aux")){
     int pigeons=1,i;
     /* how big? */
     c->pigeon_tree=p=_ogg_calloc(1,sizeof(encode_aux_pigeonhole));
@@ -317,7 +317,7 @@
       exit(1);
     }
     /* load pigeonmap */
-    find_seek_to(in,"static long _vq_pigeonmap_");
+    find_seek_to(in,"static const long _vq_pigeonmap_");
     reset_next_value();
     p->pigeonmap=_ogg_malloc(sizeof(long)*p->mapentries);
     for(i=0;i<p->mapentries;i++)
@@ -326,7 +326,7 @@
 	exit(1);
       }    
     /* load fitlist */
-    find_seek_to(in,"static long _vq_fitlist_");
+    find_seek_to(in,"static const long _vq_fitlist_");
     reset_next_value();
     p->fitlist=_ogg_malloc(sizeof(long)*p->fittotal);
     for(i=0;i<p->fittotal;i++)
@@ -335,7 +335,7 @@
 	exit(1);
       }    
     /* load fitmap */
-    find_seek_to(in,"static long _vq_fitmap_");
+    find_seek_to(in,"static const long _vq_fitmap_");
     reset_next_value();
     for(i=0;i<c->dim;i++)pigeons*=p->quantvals;
     p->fitmap=_ogg_malloc(sizeof(long)*pigeons);
@@ -346,7 +346,7 @@
       }    
  
     /* load fitlength */
-    find_seek_to(in,"static long _vq_fitlength_");
+    find_seek_to(in,"static const long _vq_fitlength_");
     reset_next_value();
     p->fitlength=_ogg_malloc(sizeof(long)*pigeons);
     for(i=0;i<pigeons;i++)
@@ -369,7 +369,7 @@
   }
     
   /* load the quantized entries */
-  find_seek_to(in,"static long _vq_quantlist_");
+  find_seek_to(in,"static const long _vq_quantlist_");
   reset_next_value();
   c->quantlist=_ogg_malloc(sizeof(long)*quant_to_read);
   for(i=0;i<quant_to_read;i++)
@@ -539,7 +539,7 @@
   /* quantlist */
   if(c->quantlist){
     long vals=(c->maptype==1?_book_maptype1_quantvals(c):c->entries*c->dim);
-    fprintf(out,"static long _vq_quantlist_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_quantlist_%s[] = {\n",name);
     for(j=0;j<vals;j++){
       fprintf(out,"\t%ld,\n",c->quantlist[j]);
     }
@@ -547,7 +547,7 @@
   }
 
   /* lengthlist */
-  fprintf(out,"static long _vq_lengthlist_%s[] = {\n",name);
+  fprintf(out,"static const long _vq_lengthlist_%s[] = {\n",name);
   for(j=0;j<c->entries;){
     fprintf(out,"\t");
     for(k=0;k<16 && j<c->entries;k++,j++)
@@ -558,7 +558,7 @@
 
   if(t){
     /* quantthresh */
-    fprintf(out,"static float _vq_quantthresh_%s[] = {\n",name);
+    fprintf(out,"static const float _vq_quantthresh_%s[] = {\n",name);
     for(j=0;j<t->threshvals-1;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<t->threshvals-1;k++,j++)
@@ -568,7 +568,7 @@
     fprintf(out,"};\n\n");
 
     /* quantmap */
-    fprintf(out,"static long _vq_quantmap_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_quantmap_%s[] = {\n",name);
     for(j=0;j<t->threshvals;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<t->threshvals;k++,j++)
@@ -577,9 +577,9 @@
     }
     fprintf(out,"};\n\n");  
 
-    fprintf(out,"static encode_aux_threshmatch _vq_auxt_%s = {\n",name);
-    fprintf(out,"\t_vq_quantthresh_%s,\n",name);
-    fprintf(out,"\t_vq_quantmap_%s,\n",name);
+    fprintf(out,"static const encode_aux_threshmatch _vq_auxt_%s = {\n",name);
+    fprintf(out,"\t(float *)_vq_quantthresh_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_quantmap_%s,\n",name);
     fprintf(out,"\t%d,\n",t->quantvals);
     fprintf(out,"\t%d\n};\n\n",t->threshvals);
   }
@@ -589,7 +589,7 @@
     for(i=0;i<c->dim;i++)pigeons*=p->quantvals;
 
     /* pigeonmap */
-    fprintf(out,"static long _vq_pigeonmap_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_pigeonmap_%s[] = {\n",name);
     for(j=0;j<p->mapentries;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<p->mapentries;k++,j++)
@@ -598,7 +598,7 @@
     }
     fprintf(out,"};\n\n");
     /* fitlist */
-    fprintf(out,"static long _vq_fitlist_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_fitlist_%s[] = {\n",name);
     for(j=0;j<p->fittotal;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<p->fittotal;k++,j++)
@@ -607,7 +607,7 @@
     }
     fprintf(out,"};\n\n");
     /* fitmap */
-    fprintf(out,"static long _vq_fitmap_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_fitmap_%s[] = {\n",name);
     for(j=0;j<pigeons;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<pigeons;k++,j++)
@@ -616,7 +616,7 @@
     }
     fprintf(out,"};\n\n");
     /* fitlength */
-    fprintf(out,"static long _vq_fitlength_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_fitlength_%s[] = {\n",name);
     for(j=0;j<pigeons;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<pigeons;k++,j++)
@@ -625,22 +625,22 @@
     }
     fprintf(out,"};\n\n");
 
-    fprintf(out,"static encode_aux_pigeonhole _vq_auxp_%s = {\n",name);
+    fprintf(out,"static const encode_aux_pigeonhole _vq_auxp_%s = {\n",name);
     fprintf(out,"\t%g, %g, %d, %d,\n",
 	    p->min,p->del,p->mapentries,p->quantvals);
 
     fprintf(out,"\t_vq_pigeonmap_%s,\n",name);
 
     fprintf(out,"\t%ld,\n",p->fittotal);
-    fprintf(out,"\t_vq_fitlist_%s,\n",name);
-    fprintf(out,"\t_vq_fitmap_%s,\n",name);
-    fprintf(out,"\t_vq_fitlength_%s\n};\n\n",name);
+    fprintf(out,"\t(long *)_vq_fitlist_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_fitmap_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_fitlength_%s\n};\n\n",name);
   }
 
   if(n){
     
     /* ptr0 */
-    fprintf(out,"static long _vq_ptr0_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_ptr0_%s[] = {\n",name);
     for(j=0;j<n->aux;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<n->aux;k++,j++)
@@ -650,7 +650,7 @@
     fprintf(out,"};\n\n");
     
     /* ptr1 */
-    fprintf(out,"static long _vq_ptr1_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_ptr1_%s[] = {\n",name);
     for(j=0;j<n->aux;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<n->aux;k++,j++)
@@ -660,7 +660,7 @@
     fprintf(out,"};\n\n");
     
     /* p */
-    fprintf(out,"static long _vq_p_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_p_%s[] = {\n",name);
     for(j=0;j<n->aux;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<n->aux;k++,j++)
@@ -670,7 +670,7 @@
     fprintf(out,"};\n\n");
     
     /* q */
-    fprintf(out,"static long _vq_q_%s[] = {\n",name);
+    fprintf(out,"static const long _vq_q_%s[] = {\n",name);
     for(j=0;j<n->aux;){
       fprintf(out,"\t");
       for(k=0;k<8 && j<n->aux;k++,j++)
@@ -679,37 +679,37 @@
     }
     fprintf(out,"};\n\n");
   
-    fprintf(out,"static encode_aux_nearestmatch _vq_auxn_%s = {\n",name);
-    fprintf(out,"\t_vq_ptr0_%s,\n",name);
-    fprintf(out,"\t_vq_ptr1_%s,\n",name);
-    fprintf(out,"\t_vq_p_%s,\n",name);
-    fprintf(out,"\t_vq_q_%s,\n",name);
+    fprintf(out,"static const encode_aux_nearestmatch _vq_auxn_%s = {\n",name);
+    fprintf(out,"\t(long *)_vq_ptr0_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_ptr1_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_p_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_q_%s,\n",name);
     fprintf(out,"\t%ld, %ld\n};\n\n",n->aux,n->aux);
   }
 
   /* tie it all together */
   
-  fprintf(out,"static static_codebook %s = {\n",name);
+  fprintf(out,"static const static_codebook %s = {\n",name);
   
   fprintf(out,"\t%ld, %ld,\n",c->dim,c->entries);
-  fprintf(out,"\t_vq_lengthlist_%s,\n",name);
+  fprintf(out,"\t(long *)_vq_lengthlist_%s,\n",name);
   fprintf(out,"\t%d, %ld, %ld, %d, %d,\n",
           c->maptype,c->q_min,c->q_delta,c->q_quant,c->q_sequencep);
   if(c->quantlist)
-    fprintf(out,"\t_vq_quantlist_%s,\n",name);
+    fprintf(out,"\t(long *)_vq_quantlist_%s,\n",name);
   else
     fprintf(out,"\tNULL,\n");
 
   if(n)
-    fprintf(out,"\t&_vq_auxn_%s,\n",name);
+    fprintf(out,"\t(encode_aux_nearestmatch *)&_vq_auxn_%s,\n",name);
   else
     fprintf(out,"\tNULL,\n");
   if(t)
-    fprintf(out,"\t&_vq_auxt_%s,\n",name);
+    fprintf(out,"\t(encode_aux_threshmatch *)&_vq_auxt_%s,\n",name);
   else
     fprintf(out,"\tNULL,\n");
   if(p)
-    fprintf(out,"\t&_vq_auxp_%s,\n",name);
+    fprintf(out,"\t(encode_aux_pigeonhole *)&_vq_auxp_%s,\n",name);
   else
     fprintf(out,"\tNULL,\n");
 

Modified: trunk/vorbis/vq/huffbuild.c
===================================================================
--- trunk/vorbis/vq/huffbuild.c	2008-11-24 18:50:32 UTC (rev 15530)
+++ trunk/vorbis/vq/huffbuild.c	2008-11-24 23:50:06 UTC (rev 15531)
@@ -162,7 +162,7 @@
     
     /* first, the static vectors, then the book structure to tie it together. */
     /* lengthlist */
-    fprintf(file,"static long _huff_lengthlist_%s[] = {\n",base);
+    fprintf(file,"static const long _huff_lengthlist_%s[] = {\n",base);
     for(j=0;j<vals;){
       fprintf(file,"\t");
       for(k=0;k<16 && j<vals;k++,j++)
@@ -172,9 +172,9 @@
     fprintf(file,"};\n\n");
     
     /* the toplevel book */
-    fprintf(file,"static static_codebook _huff_book_%s = {\n",base);
+    fprintf(file,"static const static_codebook _huff_book_%s = {\n",base);
     fprintf(file,"\t%d, %ld,\n",subn,vals);
-    fprintf(file,"\t_huff_lengthlist_%s,\n",base);
+    fprintf(file,"\t(long *)_huff_lengthlist_%s,\n",base);
     fprintf(file,"\t0, 0, 0, 0, 0,\n");
     fprintf(file,"\tNULL,\n");
 



More information about the commits mailing list