[xiph-commits] r16939 - in trunk/vorbis/lib: . books/coupled books/floor books/uncoupled

xiphmont at svn.xiph.org xiphmont at svn.xiph.org
Mon Mar 1 00:38:14 PST 2010


Author: xiphmont
Date: 2010-03-01 00:38:14 -0800 (Mon, 01 Mar 2010)
New Revision: 16939

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/codebook.c
   trunk/vorbis/lib/codebook.h
   trunk/vorbis/lib/mapping0.c
   trunk/vorbis/lib/res0.c
   trunk/vorbis/lib/sharedbook.c
Log:
Some significant encoder-side codebook cleanup toward new surround code 
landing.

This is primarily elimination of dead code and useless float vectors 
that are of no use given the current encoder codebook strategy.



Modified: trunk/vorbis/lib/backends.h
===================================================================
--- trunk/vorbis/lib/backends.h	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/backends.h	2010-03-01 08:38:14 UTC (rev 16939)
@@ -96,7 +96,7 @@
                         float **,int *,int);
   int  (*forward)      (oggpack_buffer *,struct vorbis_block *,
                         vorbis_look_residue *,
-                        float **,float **,int *,int,long **);
+                        int **,int *,int,long **);
   int  (*inverse)      (struct vorbis_block *,vorbis_look_residue *,
                         float **,int *,int);
 } vorbis_func_residue;

Modified: trunk/vorbis/lib/books/coupled/res_books_stereo.h
===================================================================
--- trunk/vorbis/lib/books/coupled/res_books_stereo.h	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/books/coupled/res_books_stereo.h	2010-03-01 08:38:14 UTC (rev 16939)
@@ -436,29 +436,11 @@
          0,
 };
 
-static const float _vq_quantthresh__16c0_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16c0_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c0_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__16c0_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16c0_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p1_0,
-        NULL,
         0
 };
 
@@ -513,29 +495,11 @@
          0,
 };
 
-static const float _vq_quantthresh__16c0_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16c0_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16c0_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__16c0_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16c0_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p3_0,
-        NULL,
         0
 };
 
@@ -560,30 +524,11 @@
          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 const long _vq_quantmap__16c0_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16c0_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__16c0_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c0_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p4_0,
-        NULL,
         0
 };
 
@@ -608,30 +553,11 @@
         10,
 };
 
-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 const long _vq_quantmap__16c0_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16c0_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__16c0_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c0_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p5_0,
-        NULL,
         0
 };
 
@@ -677,32 +603,11 @@
         14,
 };
 
-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 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 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 const static_codebook _16c0_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__16c0_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c0_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p6_0,
-        NULL,
         0
 };
 
@@ -721,29 +626,11 @@
         13,
 };
 
-static const float _vq_quantthresh__16c0_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__16c0_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c0_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__16c0_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__16c0_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p7_0,
-        NULL,
         0
 };
 
@@ -772,31 +659,11 @@
         11,11,11, 9, 9, 9, 9,10,10,
 };
 
-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 const long _vq_quantmap__16c0_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16c0_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__16c0_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c0_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p7_1,
-        NULL,
         0
 };
 
@@ -830,31 +697,11 @@
          0,12,13,13,12,13,14,14,14,
 };
 
-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 const long _vq_quantmap__16c0_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16c0_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__16c0_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__16c0_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p8_0,
-        NULL,
         0
 };
 
@@ -871,29 +718,11 @@
          7, 7, 6, 6, 7, 7, 7, 6, 6,
 };
 
-static const float _vq_quantthresh__16c0_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16c0_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16c0_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__16c0_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16c0_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p8_1,
-        NULL,
         0
 };
 
@@ -912,29 +741,11 @@
          7,
 };
 
-static const float _vq_quantthresh__16c0_s_p9_0[] = {
-        -157.5, 157.5, 
-};
-
-static const long _vq_quantmap__16c0_s_p9_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c0_s_p9_0 = {
         4, 81,
         (long *)_vq_lengthlist__16c0_s_p9_0,
         1, -518803456, 1628680192, 2, 0,
         (long *)_vq_quantlist__16c0_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_0,
-        NULL,
         0
 };
 
@@ -974,31 +785,11 @@
         10,
 };
 
-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 const long _vq_quantmap__16c0_s_p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16c0_s_p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__16c0_s_p9_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__16c0_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_1,
-        NULL,
         0
 };
 
@@ -1057,33 +848,11 @@
         10,11,10,10,11, 9,10,10,10,
 };
 
-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 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 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 const static_codebook _16c0_s_p9_2 = {
         2, 441,
         (long *)_vq_lengthlist__16c0_s_p9_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c0_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_2,
-        NULL,
         0
 };
 
@@ -1102,9 +871,6 @@
         (long *)_huff_lengthlist__16c0_s_single,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1123,9 +889,6 @@
         (long *)_huff_lengthlist__16c1_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1549,29 +1312,11 @@
          0,
 };
 
-static const float _vq_quantthresh__16c1_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16c1_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c1_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__16c1_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16c1_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p1_0,
-        NULL,
         0
 };
 
@@ -1626,29 +1371,11 @@
          0,
 };
 
-static const float _vq_quantthresh__16c1_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16c1_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16c1_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__16c1_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16c1_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p3_0,
-        NULL,
         0
 };
 
@@ -1673,30 +1400,11 @@
          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 const long _vq_quantmap__16c1_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16c1_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__16c1_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c1_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p4_0,
-        NULL,
         0
 };
 
@@ -1721,30 +1429,11 @@
         10,
 };
 
-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 const long _vq_quantmap__16c1_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16c1_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__16c1_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c1_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p5_0,
-        NULL,
         0
 };
 
@@ -1790,32 +1479,11 @@
         14,
 };
 
-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 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 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 const static_codebook _16c1_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__16c1_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c1_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p6_0,
-        NULL,
         0
 };
 
@@ -1834,29 +1502,11 @@
         11,
 };
 
-static const float _vq_quantthresh__16c1_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__16c1_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c1_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__16c1_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__16c1_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p7_0,
-        NULL,
         0
 };
 
@@ -1885,31 +1535,11 @@
         10,10,10, 8, 8, 8, 8, 9, 9,
 };
 
-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 const long _vq_quantmap__16c1_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16c1_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__16c1_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c1_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p7_1,
-        NULL,
         0
 };
 
@@ -1943,31 +1573,11 @@
          0,12,12,12,12,13,13,14,15,
 };
 
-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 const long _vq_quantmap__16c1_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16c1_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__16c1_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__16c1_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p8_0,
-        NULL,
         0
 };
 
@@ -1984,29 +1594,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__16c1_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16c1_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16c1_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__16c1_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16c1_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p8_1,
-        NULL,
         0
 };
 
@@ -2040,31 +1632,11 @@
          8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__16c1_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16c1_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__16c1_s_p9_0,
         1, -513964032, 1628680192, 4, 0,
         (long *)_vq_quantlist__16c1_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_0,
-        NULL,
         0
 };
 
@@ -2104,31 +1676,11 @@
         13,
 };
 
-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 const long _vq_quantmap__16c1_s_p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16c1_s_p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__16c1_s_p9_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__16c1_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_1,
-        NULL,
         0
 };
 
@@ -2187,33 +1739,11 @@
         11,11,11,11,12,11,11,12,11,
 };
 
-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 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 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 const static_codebook _16c1_s_p9_2 = {
         2, 441,
         (long *)_vq_lengthlist__16c1_s_p9_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c1_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_2,
-        NULL,
         0
 };
 
@@ -2232,9 +1762,6 @@
         (long *)_huff_lengthlist__16c1_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -2253,9 +1780,6 @@
         (long *)_huff_lengthlist__16c2_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -2274,29 +1798,11 @@
          0,
 };
 
-static const float _vq_quantthresh__16c2_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16c2_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c2_s_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__16c2_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16c2_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p1_0,
-        NULL,
         0
 };
 
@@ -2351,29 +1857,11 @@
         13,
 };
 
-static const float _vq_quantthresh__16c2_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16c2_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16c2_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__16c2_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16c2_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p2_0,
-        NULL,
         0
 };
 
@@ -2398,30 +1886,11 @@
          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 const long _vq_quantmap__16c2_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16c2_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__16c2_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c2_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p3_0,
-        NULL,
         0
 };
 
@@ -2467,32 +1936,11 @@
          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 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 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 const static_codebook _16c2_s_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__16c2_s_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c2_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p4_0,
-        NULL,
         0
 };
 
@@ -2511,29 +1959,11 @@
         12,
 };
 
-static const float _vq_quantthresh__16c2_s_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__16c2_s_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16c2_s_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__16c2_s_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__16c2_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p5_0,
-        NULL,
         0
 };
 
@@ -2562,31 +1992,11 @@
         11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__16c2_s_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16c2_s_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__16c2_s_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c2_s_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p5_1,
-        NULL,
         0
 };
 
@@ -2620,31 +2030,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 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 const long _vq_quantmap__16c2_s_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16c2_s_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__16c2_s_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__16c2_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p6_0,
-        NULL,
         0
 };
 
@@ -2661,29 +2051,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__16c2_s_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16c2_s_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16c2_s_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__16c2_s_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16c2_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p6_1,
-        NULL,
         0
 };
 
@@ -2717,31 +2089,11 @@
         18,13,14,13,13,14,13,15,14,
 };
 
-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 const long _vq_quantmap__16c2_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16c2_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__16c2_s_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__16c2_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p7_0,
-        NULL,
         0
 };
 
@@ -2770,31 +2122,11 @@
          9, 9, 9, 7, 7, 7, 7, 8, 8,
 };
 
-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 const long _vq_quantmap__16c2_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16c2_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__16c2_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16c2_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p7_1,
-        NULL,
         0
 };
 
@@ -2834,31 +2166,11 @@
         13,
 };
 
-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 const long _vq_quantmap__16c2_s_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16c2_s_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__16c2_s_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__16c2_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p8_0,
-        NULL,
         0
 };
 
@@ -2917,33 +2229,11 @@
         10,11,10,10,10,10,10,10,10,
 };
 
-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 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 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 const static_codebook _16c2_s_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__16c2_s_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c2_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p8_1,
-        NULL,
         0
 };
 
@@ -2977,31 +2267,11 @@
          8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__16c2_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16c2_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__16c2_s_p9_0,
         1, -510275072, 1631393792, 4, 0,
         (long *)_vq_quantlist__16c2_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_0,
-        NULL,
         0
 };
 
@@ -3047,32 +2317,11 @@
         10,
 };
 
-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 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 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 const static_codebook _16c2_s_p9_1 = {
         2, 289,
         (long *)_vq_lengthlist__16c2_s_p9_1,
         1, -518488064, 1622704128, 5, 0,
         (long *)_vq_quantlist__16c2_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_1,
-        NULL,
         0
 };
 
@@ -3111,35 +2360,11 @@
          7, 7, 7, 7, 8, 7, 8, 7, 7, 4, 4,
 };
 
-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 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 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 const static_codebook _16c2_s_p9_2 = {
         1, 27,
         (long *)_vq_lengthlist__16c2_s_p9_2,
         1, -528875520, 1611661312, 5, 0,
         (long *)_vq_quantlist__16c2_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_2,
-        NULL,
         0
 };
 
@@ -3158,9 +2383,6 @@
         (long *)_huff_lengthlist__16c2_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -3584,29 +2806,11 @@
          0,
 };
 
-static const float _vq_quantthresh__8c0_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__8c0_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8c0_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__8c0_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__8c0_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p1_0,
-        NULL,
         0
 };
 
@@ -3661,29 +2865,11 @@
          0,
 };
 
-static const float _vq_quantthresh__8c0_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8c0_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8c0_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__8c0_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8c0_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p3_0,
-        NULL,
         0
 };
 
@@ -3708,30 +2894,11 @@
          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 const long _vq_quantmap__8c0_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8c0_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__8c0_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8c0_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p4_0,
-        NULL,
         0
 };
 
@@ -3756,30 +2923,11 @@
         10,
 };
 
-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 const long _vq_quantmap__8c0_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8c0_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__8c0_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8c0_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p5_0,
-        NULL,
         0
 };
 
@@ -3825,32 +2973,11 @@
         14,
 };
 
-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 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 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 const static_codebook _8c0_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__8c0_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__8c0_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p6_0,
-        NULL,
         0
 };
 
@@ -3869,29 +2996,11 @@
         10,
 };
 
-static const float _vq_quantthresh__8c0_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__8c0_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8c0_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__8c0_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__8c0_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p7_0,
-        NULL,
         0
 };
 
@@ -3920,31 +3029,11 @@
         10,10,10, 9, 9, 9,10,10,10,
 };
 
-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 const long _vq_quantmap__8c0_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _8c0_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__8c0_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__8c0_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p7_1,
-        NULL,
         0
 };
 
@@ -3978,31 +3067,11 @@
          0, 0,13,13,11,13,13,11,12,
 };
 
-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 const long _vq_quantmap__8c0_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _8c0_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__8c0_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__8c0_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p8_0,
-        NULL,
         0
 };
 
@@ -4019,29 +3088,11 @@
          7, 7, 6, 6, 7, 7, 7, 6, 6,
 };
 
-static const float _vq_quantthresh__8c0_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8c0_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8c0_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__8c0_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8c0_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p8_1,
-        NULL,
         0
 };
 
@@ -4060,29 +3111,11 @@
          7,
 };
 
-static const float _vq_quantthresh__8c0_s_p9_0[] = {
-        -157.5, 157.5, 
-};
-
-static const long _vq_quantmap__8c0_s_p9_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8c0_s_p9_0 = {
         4, 81,
         (long *)_vq_lengthlist__8c0_s_p9_0,
         1, -518803456, 1628680192, 2, 0,
         (long *)_vq_quantlist__8c0_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_0,
-        NULL,
         0
 };
 
@@ -4122,31 +3155,11 @@
         11,
 };
 
-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 const long _vq_quantmap__8c0_s_p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _8c0_s_p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__8c0_s_p9_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__8c0_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_1,
-        NULL,
         0
 };
 
@@ -4205,33 +3218,11 @@
         10,11, 9,11,10, 9,10, 9,10,
 };
 
-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 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 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 const static_codebook _8c0_s_p9_2 = {
         2, 441,
         (long *)_vq_lengthlist__8c0_s_p9_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__8c0_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_2,
-        NULL,
         0
 };
 
@@ -4250,9 +3241,6 @@
         (long *)_huff_lengthlist__8c0_s_single,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -4676,29 +3664,11 @@
          0,
 };
 
-static const float _vq_quantthresh__8c1_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__8c1_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8c1_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__8c1_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__8c1_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p1_0,
-        NULL,
         0
 };
 
@@ -4753,29 +3723,11 @@
          0,
 };
 
-static const float _vq_quantthresh__8c1_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8c1_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8c1_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__8c1_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8c1_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p3_0,
-        NULL,
         0
 };
 
@@ -4800,30 +3752,11 @@
          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 const long _vq_quantmap__8c1_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8c1_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__8c1_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8c1_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p4_0,
-        NULL,
         0
 };
 
@@ -4848,30 +3781,11 @@
         10,
 };
 
-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 const long _vq_quantmap__8c1_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8c1_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__8c1_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8c1_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p5_0,
-        NULL,
         0
 };
 
@@ -4917,32 +3831,11 @@
         14,
 };
 
-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 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 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 const static_codebook _8c1_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__8c1_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__8c1_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p6_0,
-        NULL,
         0
 };
 
@@ -4961,29 +3854,11 @@
          9,
 };
 
-static const float _vq_quantthresh__8c1_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__8c1_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8c1_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__8c1_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__8c1_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p7_0,
-        NULL,
         0
 };
 
@@ -5012,31 +3887,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__8c1_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _8c1_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__8c1_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__8c1_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p7_1,
-        NULL,
         0
 };
 
@@ -5070,31 +3925,11 @@
          0,12,12,11,10,12,11,13,12,
 };
 
-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 const long _vq_quantmap__8c1_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _8c1_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__8c1_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__8c1_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p8_0,
-        NULL,
         0
 };
 
@@ -5111,29 +3946,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__8c1_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8c1_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8c1_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__8c1_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8c1_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p8_1,
-        NULL,
         0
 };
 
@@ -5167,31 +3984,11 @@
         10,10,10,10,10, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__8c1_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _8c1_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__8c1_s_p9_0,
         1, -513964032, 1628680192, 4, 0,
         (long *)_vq_quantlist__8c1_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_0,
-        NULL,
         0
 };
 
@@ -5231,31 +4028,11 @@
         15,
 };
 
-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 const long _vq_quantmap__8c1_s_p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _8c1_s_p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__8c1_s_p9_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__8c1_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_1,
-        NULL,
         0
 };
 
@@ -5314,33 +4091,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 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 const static_codebook _8c1_s_p9_2 = {
         2, 441,
         (long *)_vq_lengthlist__8c1_s_p9_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__8c1_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_2,
-        NULL,
         0
 };
 
@@ -5359,9 +4114,6 @@
         (long *)_huff_lengthlist__8c1_s_single,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -5380,9 +4132,6 @@
         (long *)_huff_lengthlist__44c2_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -5806,29 +4555,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c2_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c2_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c2_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c2_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c2_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p1_0,
-        NULL,
         0
 };
 
@@ -5883,29 +4614,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c2_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c2_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c2_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c2_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c2_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p2_0,
-        NULL,
         0
 };
 
@@ -5960,29 +4673,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c2_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c2_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c2_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c2_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c2_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p3_0,
-        NULL,
         0
 };
 
@@ -6007,30 +4702,11 @@
          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 const long _vq_quantmap__44c2_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c2_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c2_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c2_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p4_0,
-        NULL,
         0
 };
 
@@ -6055,30 +4731,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44c2_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c2_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c2_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c2_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p5_0,
-        NULL,
         0
 };
 
@@ -6124,32 +4781,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44c2_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c2_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c2_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p6_0,
-        NULL,
         0
 };
 
@@ -6168,29 +4804,11 @@
         11,
 };
 
-static const float _vq_quantthresh__44c2_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c2_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c2_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c2_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c2_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p7_0,
-        NULL,
         0
 };
 
@@ -6219,31 +4837,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c2_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c2_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c2_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c2_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p7_1,
-        NULL,
         0
 };
 
@@ -6277,31 +4875,11 @@
          0,12,12,12,12,13,12,14,14,
 };
 
-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 const long _vq_quantmap__44c2_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c2_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c2_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c2_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p8_0,
-        NULL,
         0
 };
 
@@ -6318,29 +4896,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c2_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c2_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c2_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c2_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c2_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p8_1,
-        NULL,
         0
 };
 
@@ -6374,31 +4934,11 @@
         11,11,11,11,11,11,11,11,11,
 };
 
-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 const long _vq_quantmap__44c2_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c2_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c2_s_p9_0,
         1, -514541568, 1627103232, 4, 0,
         (long *)_vq_quantlist__44c2_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_0,
-        NULL,
         0
 };
 
@@ -6432,31 +4972,11 @@
         17,13,12,12,10,13,11,14,14,
 };
 
-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 const long _vq_quantmap__44c2_s_p9_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c2_s_p9_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c2_s_p9_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44c2_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_1,
-        NULL,
         0
 };
 
@@ -6502,32 +5022,11 @@
         10,
 };
 
-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 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 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 const static_codebook _44c2_s_p9_2 = {
         2, 289,
         (long *)_vq_lengthlist__44c2_s_p9_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c2_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_2,
-        NULL,
         0
 };
 
@@ -6546,9 +5045,6 @@
         (long *)_huff_lengthlist__44c2_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -6567,9 +5063,6 @@
         (long *)_huff_lengthlist__44c3_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -6993,29 +5486,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c3_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c3_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c3_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c3_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c3_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p1_0,
-        NULL,
         0
 };
 
@@ -7070,29 +5545,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c3_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c3_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c3_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c3_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c3_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p2_0,
-        NULL,
         0
 };
 
@@ -7147,29 +5604,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c3_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c3_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c3_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c3_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c3_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p3_0,
-        NULL,
         0
 };
 
@@ -7194,30 +5633,11 @@
          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 const long _vq_quantmap__44c3_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c3_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c3_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c3_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p4_0,
-        NULL,
         0
 };
 
@@ -7242,30 +5662,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44c3_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c3_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c3_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c3_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p5_0,
-        NULL,
         0
 };
 
@@ -7311,32 +5712,11 @@
         13,
 };
 
-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 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 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 const static_codebook _44c3_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c3_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c3_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p6_0,
-        NULL,
         0
 };
 
@@ -7355,29 +5735,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44c3_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c3_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c3_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c3_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c3_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p7_0,
-        NULL,
         0
 };
 
@@ -7406,31 +5768,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c3_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c3_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c3_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c3_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p7_1,
-        NULL,
         0
 };
 
@@ -7464,31 +5806,11 @@
          0,13,13,12,12,13,12,14,13,
 };
 
-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 const long _vq_quantmap__44c3_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c3_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c3_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c3_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p8_0,
-        NULL,
         0
 };
 
@@ -7505,29 +5827,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c3_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c3_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c3_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c3_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c3_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p8_1,
-        NULL,
         0
 };
 
@@ -7561,31 +5865,11 @@
         11,11,11,11,11,11,11,11,11,
 };
 
-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 const long _vq_quantmap__44c3_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c3_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c3_s_p9_0,
         1, -514332672, 1627381760, 4, 0,
         (long *)_vq_quantlist__44c3_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_0,
-        NULL,
         0
 };
 
@@ -7625,31 +5909,11 @@
         15,
 };
 
-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 const long _vq_quantmap__44c3_s_p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c3_s_p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__44c3_s_p9_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__44c3_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_1,
-        NULL,
         0
 };
 
@@ -7695,32 +5959,11 @@
         10,
 };
 
-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 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 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 const static_codebook _44c3_s_p9_2 = {
         2, 289,
         (long *)_vq_lengthlist__44c3_s_p9_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c3_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_2,
-        NULL,
         0
 };
 
@@ -7739,9 +5982,6 @@
         (long *)_huff_lengthlist__44c3_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -7760,9 +6000,6 @@
         (long *)_huff_lengthlist__44c4_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -8186,29 +6423,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c4_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c4_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c4_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c4_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c4_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p1_0,
-        NULL,
         0
 };
 
@@ -8263,29 +6482,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c4_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c4_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c4_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c4_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c4_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p2_0,
-        NULL,
         0
 };
 
@@ -8340,29 +6541,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c4_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c4_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c4_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c4_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c4_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p3_0,
-        NULL,
         0
 };
 
@@ -8387,30 +6570,11 @@
          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 const long _vq_quantmap__44c4_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c4_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c4_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c4_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p4_0,
-        NULL,
         0
 };
 
@@ -8435,30 +6599,11 @@
         10,
 };
 
-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 const long _vq_quantmap__44c4_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c4_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c4_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c4_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p5_0,
-        NULL,
         0
 };
 
@@ -8504,32 +6649,11 @@
         13,
 };
 
-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 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 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 const static_codebook _44c4_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c4_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c4_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p6_0,
-        NULL,
         0
 };
 
@@ -8548,29 +6672,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44c4_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c4_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c4_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c4_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c4_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p7_0,
-        NULL,
         0
 };
 
@@ -8599,31 +6705,11 @@
         10,10,10, 8, 8, 8, 8, 9, 9,
 };
 
-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 const long _vq_quantmap__44c4_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c4_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c4_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c4_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p7_1,
-        NULL,
         0
 };
 
@@ -8657,31 +6743,11 @@
          0,13,12,12,12,12,12,13,13,
 };
 
-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 const long _vq_quantmap__44c4_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c4_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c4_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c4_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p8_0,
-        NULL,
         0
 };
 
@@ -8698,29 +6764,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c4_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c4_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c4_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c4_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c4_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p8_1,
-        NULL,
         0
 };
 
@@ -8754,31 +6802,11 @@
         12,12,12,12,12,12,12,12,12,
 };
 
-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 const long _vq_quantmap__44c4_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c4_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c4_s_p9_0,
         1, -513964032, 1628680192, 4, 0,
         (long *)_vq_quantlist__44c4_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_0,
-        NULL,
         0
 };
 
@@ -8818,31 +6846,11 @@
         15,
 };
 
-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 const long _vq_quantmap__44c4_s_p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c4_s_p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__44c4_s_p9_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44c4_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_1,
-        NULL,
         0
 };
 
@@ -8901,33 +6909,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 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 const static_codebook _44c4_s_p9_2 = {
         2, 441,
         (long *)_vq_lengthlist__44c4_s_p9_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c4_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_2,
-        NULL,
         0
 };
 
@@ -8946,9 +6932,6 @@
         (long *)_huff_lengthlist__44c4_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -8967,9 +6950,6 @@
         (long *)_huff_lengthlist__44c5_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -9393,29 +7373,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c5_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c5_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c5_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c5_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c5_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p1_0,
-        NULL,
         0
 };
 
@@ -9470,29 +7432,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c5_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c5_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c5_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c5_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c5_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p2_0,
-        NULL,
         0
 };
 
@@ -9547,29 +7491,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c5_s_p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c5_s_p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c5_s_p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c5_s_p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c5_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p3_0,
-        NULL,
         0
 };
 
@@ -9594,30 +7520,11 @@
          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 const long _vq_quantmap__44c5_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c5_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c5_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c5_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p4_0,
-        NULL,
         0
 };
 
@@ -9642,30 +7549,11 @@
         10,
 };
 
-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 const long _vq_quantmap__44c5_s_p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c5_s_p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c5_s_p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c5_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p5_0,
-        NULL,
         0
 };
 
@@ -9711,32 +7599,11 @@
         13,
 };
 
-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 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 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 const static_codebook _44c5_s_p6_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c5_s_p6_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c5_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p6_0,
-        NULL,
         0
 };
 
@@ -9755,29 +7622,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44c5_s_p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c5_s_p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c5_s_p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c5_s_p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c5_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p7_0,
-        NULL,
         0
 };
 
@@ -9806,31 +7655,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c5_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c5_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c5_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c5_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p7_1,
-        NULL,
         0
 };
 
@@ -9864,31 +7693,11 @@
          0,12,12,12,12,12,12,13,13,
 };
 
-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 const long _vq_quantmap__44c5_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c5_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c5_s_p8_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c5_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p8_0,
-        NULL,
         0
 };
 
@@ -9905,29 +7714,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c5_s_p8_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c5_s_p8_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c5_s_p8_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c5_s_p8_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c5_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p8_1,
-        NULL,
         0
 };
 
@@ -9967,31 +7758,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44c5_s_p9_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c5_s_p9_0 = {
         2, 225,
         (long *)_vq_lengthlist__44c5_s_p9_0,
         1, -512522752, 1628852224, 4, 0,
         (long *)_vq_quantlist__44c5_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_0,
-        NULL,
         0
 };
 
@@ -10037,32 +7808,11 @@
         15,
 };
 
-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 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 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 const static_codebook _44c5_s_p9_1 = {
         2, 289,
         (long *)_vq_lengthlist__44c5_s_p9_1,
         1, -520814592, 1620377600, 5, 0,
         (long *)_vq_quantlist__44c5_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_1,
-        NULL,
         0
 };
 
@@ -10121,33 +7871,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 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 const static_codebook _44c5_s_p9_2 = {
         2, 441,
         (long *)_vq_lengthlist__44c5_s_p9_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c5_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_2,
-        NULL,
         0
 };
 
@@ -10166,9 +7894,6 @@
         (long *)_huff_lengthlist__44c5_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -10187,9 +7912,6 @@
         (long *)_huff_lengthlist__44c6_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -10207,30 +7929,11 @@
          9, 9, 0, 8, 8, 0, 8, 8, 5, 9, 9, 0, 8, 8, 0, 8,
          8,
 };
-
-static const float _vq_quantthresh__44c6_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c6_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c6_s_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c6_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c6_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p1_0,
-        NULL,
         0
 };
 
@@ -10285,29 +7988,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44c6_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c6_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c6_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c6_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c6_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p2_0,
-        NULL,
         0
 };
 
@@ -10332,30 +8017,11 @@
          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 const long _vq_quantmap__44c6_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c6_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c6_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c6_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p3_0,
-        NULL,
         0
 };
 
@@ -10401,32 +8067,11 @@
          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 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 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 const static_codebook _44c6_s_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c6_s_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c6_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p4_0,
-        NULL,
         0
 };
 
@@ -10445,29 +8090,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44c6_s_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c6_s_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c6_s_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c6_s_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c6_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p5_0,
-        NULL,
         0
 };
 
@@ -10496,31 +8123,11 @@
         11,10,10, 7, 7, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c6_s_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c6_s_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c6_s_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c6_s_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p5_1,
-        NULL,
         0
 };
 
@@ -10554,31 +8161,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 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 const long _vq_quantmap__44c6_s_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c6_s_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c6_s_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c6_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p6_0,
-        NULL,
         0
 };
 
@@ -10595,29 +8182,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c6_s_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c6_s_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c6_s_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c6_s_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c6_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p6_1,
-        NULL,
         0
 };
 
@@ -10651,31 +8220,11 @@
         20,13,13,13,13,13,13,14,14,
 };
 
-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 const long _vq_quantmap__44c6_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c6_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c6_s_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__44c6_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p7_0,
-        NULL,
         0
 };
 
@@ -10704,31 +8253,11 @@
          9, 8, 8, 7, 7, 7, 7, 8, 8,
 };
 
-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 const long _vq_quantmap__44c6_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c6_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c6_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c6_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p7_1,
-        NULL,
         0
 };
 
@@ -10768,31 +8297,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44c6_s_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c6_s_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__44c6_s_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44c6_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p8_0,
-        NULL,
         0
 };
 
@@ -10851,33 +8360,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 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 const static_codebook _44c6_s_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__44c6_s_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c6_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p8_1,
-        NULL,
         0
 };
 
@@ -10911,31 +8398,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 const long _vq_quantmap__44c6_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c6_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c6_s_p9_0,
         1, -511845376, 1630791680, 4, 0,
         (long *)_vq_quantlist__44c6_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_0,
-        NULL,
         0
 };
 
@@ -10969,31 +8436,11 @@
         15,12,10,11,11,13,11,12,13,
 };
 
-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 const long _vq_quantmap__44c6_s_p9_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c6_s_p9_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c6_s_p9_1,
         1, -518889472, 1622704128, 4, 0,
         (long *)_vq_quantlist__44c6_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_1,
-        NULL,
         0
 };
 
@@ -11056,40 +8503,11 @@
          7,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44c6_s_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44c6_s_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44c6_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_2,
-        NULL,
         0
 };
 
@@ -11108,9 +8526,6 @@
         (long *)_huff_lengthlist__44c6_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -11129,9 +8544,6 @@
         (long *)_huff_lengthlist__44c7_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -11150,29 +8562,11 @@
          8,
 };
 
-static const float _vq_quantthresh__44c7_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c7_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c7_s_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c7_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c7_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p1_0,
-        NULL,
         0
 };
 
@@ -11227,29 +8621,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44c7_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c7_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c7_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c7_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c7_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p2_0,
-        NULL,
         0
 };
 
@@ -11274,30 +8650,11 @@
          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 const long _vq_quantmap__44c7_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c7_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c7_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c7_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p3_0,
-        NULL,
         0
 };
 
@@ -11343,32 +8700,11 @@
          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 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 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 const static_codebook _44c7_s_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c7_s_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c7_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p4_0,
-        NULL,
         0
 };
 
@@ -11387,29 +8723,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44c7_s_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c7_s_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c7_s_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c7_s_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c7_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p5_0,
-        NULL,
         0
 };
 
@@ -11438,31 +8756,11 @@
         11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c7_s_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c7_s_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c7_s_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c7_s_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p5_1,
-        NULL,
         0
 };
 
@@ -11496,31 +8794,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 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 const long _vq_quantmap__44c7_s_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c7_s_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c7_s_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c7_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p6_0,
-        NULL,
         0
 };
 
@@ -11537,29 +8815,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c7_s_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c7_s_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c7_s_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c7_s_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c7_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p6_1,
-        NULL,
         0
 };
 
@@ -11593,31 +8853,11 @@
         19,13,13,13,13,14,14,15,15,
 };
 
-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 const long _vq_quantmap__44c7_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c7_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c7_s_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__44c7_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p7_0,
-        NULL,
         0
 };
 
@@ -11646,31 +8886,11 @@
          8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
-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 const long _vq_quantmap__44c7_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c7_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c7_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c7_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p7_1,
-        NULL,
         0
 };
 
@@ -11710,31 +8930,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44c7_s_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c7_s_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__44c7_s_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44c7_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p8_0,
-        NULL,
         0
 };
 
@@ -11793,33 +8993,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 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 const static_codebook _44c7_s_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__44c7_s_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c7_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p8_1,
-        NULL,
         0
 };
 
@@ -11853,31 +9031,11 @@
         11,11,11,11,11,11,11,11,11,
 };
 
-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 const long _vq_quantmap__44c7_s_p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c7_s_p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c7_s_p9_0,
         1, -511845376, 1630791680, 4, 0,
         (long *)_vq_quantlist__44c7_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_0,
-        NULL,
         0
 };
 
@@ -11911,31 +9069,11 @@
         15,11,11,10,10,12,12,12,12,
 };
 
-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 const long _vq_quantmap__44c7_s_p9_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c7_s_p9_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c7_s_p9_1,
         1, -518889472, 1622704128, 4, 0,
         (long *)_vq_quantlist__44c7_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_1,
-        NULL,
         0
 };
 
@@ -11998,40 +9136,11 @@
          7,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44c7_s_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44c7_s_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44c7_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_2,
-        NULL,
         0
 };
 
@@ -12050,9 +9159,6 @@
         (long *)_huff_lengthlist__44c7_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -12071,9 +9177,6 @@
         (long *)_huff_lengthlist__44c8_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -12092,29 +9195,11 @@
          8,
 };
 
-static const float _vq_quantthresh__44c8_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c8_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c8_s_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c8_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c8_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p1_0,
-        NULL,
         0
 };
 
@@ -12169,29 +9254,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44c8_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c8_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c8_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c8_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c8_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p2_0,
-        NULL,
         0
 };
 
@@ -12216,30 +9283,11 @@
          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 const long _vq_quantmap__44c8_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c8_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c8_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c8_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p3_0,
-        NULL,
         0
 };
 
@@ -12285,32 +9333,11 @@
          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 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 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 const static_codebook _44c8_s_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c8_s_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c8_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p4_0,
-        NULL,
         0
 };
 
@@ -12329,29 +9356,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44c8_s_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c8_s_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c8_s_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c8_s_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c8_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p5_0,
-        NULL,
         0
 };
 
@@ -12380,31 +9389,11 @@
         11,11,11, 7, 7, 7, 7, 8, 8,
 };
 
-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 const long _vq_quantmap__44c8_s_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c8_s_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c8_s_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c8_s_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p5_1,
-        NULL,
         0
 };
 
@@ -12438,31 +9427,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 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 const long _vq_quantmap__44c8_s_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c8_s_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c8_s_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c8_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p6_0,
-        NULL,
         0
 };
 
@@ -12479,29 +9448,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c8_s_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c8_s_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c8_s_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c8_s_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c8_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p6_1,
-        NULL,
         0
 };
 
@@ -12535,31 +9486,11 @@
         20,13,13,13,13,14,13,15,15,
 };
 
-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 const long _vq_quantmap__44c8_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c8_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c8_s_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__44c8_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p7_0,
-        NULL,
         0
 };
 
@@ -12588,31 +9519,11 @@
          8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
-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 const long _vq_quantmap__44c8_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c8_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c8_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c8_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p7_1,
-        NULL,
         0
 };
 
@@ -12652,31 +9563,11 @@
         15,
 };
 
-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 const long _vq_quantmap__44c8_s_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c8_s_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__44c8_s_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44c8_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p8_0,
-        NULL,
         0
 };
 
@@ -12735,33 +9626,11 @@
         10, 9, 9,10,10, 9,10, 9, 9,
 };
 
-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 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 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 const static_codebook _44c8_s_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__44c8_s_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c8_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p8_1,
-        NULL,
         0
 };
 
@@ -12807,32 +9676,11 @@
         10,
 };
 
-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 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 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 const static_codebook _44c8_s_p9_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c8_s_p9_0,
         1, -509798400, 1631393792, 5, 0,
         (long *)_vq_quantlist__44c8_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_0,
-        NULL,
         0
 };
 
@@ -12884,33 +9732,11 @@
         14,13,13,14,14,15,14,15,14,
 };
 
-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 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 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 const static_codebook _44c8_s_p9_1 = {
         2, 361,
         (long *)_vq_lengthlist__44c8_s_p9_1,
         1, -518287360, 1622704128, 5, 0,
         (long *)_vq_quantlist__44c8_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_1,
-        NULL,
         0
 };
 
@@ -12973,40 +9799,11 @@
          7,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44c8_s_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44c8_s_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44c8_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_2,
-        NULL,
         0
 };
 
@@ -13025,9 +9822,6 @@
         (long *)_huff_lengthlist__44c8_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -13046,9 +9840,6 @@
         (long *)_huff_lengthlist__44c9_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -13067,29 +9858,11 @@
          7,
 };
 
-static const float _vq_quantthresh__44c9_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c9_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c9_s_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c9_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c9_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p1_0,
-        NULL,
         0
 };
 
@@ -13144,29 +9917,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44c9_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c9_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c9_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c9_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c9_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p2_0,
-        NULL,
         0
 };
 
@@ -13191,30 +9946,11 @@
          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 const long _vq_quantmap__44c9_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c9_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c9_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c9_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p3_0,
-        NULL,
         0
 };
 
@@ -13260,32 +9996,11 @@
          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 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 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 const static_codebook _44c9_s_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c9_s_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c9_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p4_0,
-        NULL,
         0
 };
 
@@ -13304,29 +10019,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44c9_s_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c9_s_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c9_s_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c9_s_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c9_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p5_0,
-        NULL,
         0
 };
 
@@ -13355,31 +10052,11 @@
         11,11,11, 7, 7, 7, 7, 7, 7,
 };
 
-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 const long _vq_quantmap__44c9_s_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c9_s_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c9_s_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c9_s_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p5_1,
-        NULL,
         0
 };
 
@@ -13413,31 +10090,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 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 const long _vq_quantmap__44c9_s_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c9_s_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c9_s_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c9_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p6_0,
-        NULL,
         0
 };
 
@@ -13454,29 +10111,11 @@
          5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static const float _vq_quantthresh__44c9_s_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c9_s_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c9_s_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c9_s_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c9_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p6_1,
-        NULL,
         0
 };
 
@@ -13510,31 +10149,11 @@
         19,12,12,12,12,13,13,14,14,
 };
 
-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 const long _vq_quantmap__44c9_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c9_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c9_s_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__44c9_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p7_0,
-        NULL,
         0
 };
 
@@ -13563,31 +10182,11 @@
          8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
-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 const long _vq_quantmap__44c9_s_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c9_s_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c9_s_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c9_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p7_1,
-        NULL,
         0
 };
 
@@ -13627,31 +10226,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44c9_s_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44c9_s_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__44c9_s_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44c9_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p8_0,
-        NULL,
         0
 };
 
@@ -13710,33 +10289,11 @@
          9, 9, 9,10, 9, 9, 9, 9, 9,
 };
 
-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 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 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 const static_codebook _44c9_s_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__44c9_s_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c9_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p8_1,
-        NULL,
         0
 };
 
@@ -13788,33 +10345,11 @@
         11,11,11,11,11,11,11,11,11,
 };
 
-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 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 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 const static_codebook _44c9_s_p9_0 = {
         2, 361,
         (long *)_vq_lengthlist__44c9_s_p9_0,
         1, -508535424, 1631393792, 5, 0,
         (long *)_vq_quantlist__44c9_s_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_0,
-        NULL,
         0
 };
 
@@ -13866,33 +10401,11 @@
         13,13,13,14,13,14,15,15,15,
 };
 
-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 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 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 const static_codebook _44c9_s_p9_1 = {
         2, 361,
         (long *)_vq_lengthlist__44c9_s_p9_1,
         1, -518287360, 1622704128, 5, 0,
         (long *)_vq_quantlist__44c9_s_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_1,
-        NULL,
         0
 };
 
@@ -13955,40 +10468,11 @@
          7,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44c9_s_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44c9_s_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44c9_s_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_2,
-        NULL,
         0
 };
 
@@ -14007,9 +10491,6 @@
         (long *)_huff_lengthlist__44c9_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -14027,9 +10508,6 @@
         (long *)_huff_lengthlist__44c0_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -14453,29 +10931,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c0_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c0_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c0_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c0_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c0_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p1_0,
-        NULL,
         0
 };
 
@@ -14530,29 +10990,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c0_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c0_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c0_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c0_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c0_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p2_0,
-        NULL,
         0
 };
 
@@ -14577,30 +11019,11 @@
          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 const long _vq_quantmap__44c0_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c0_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c0_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c0_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p3_0,
-        NULL,
         0
 };
 
@@ -14625,30 +11048,11 @@
         10,
 };
 
-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 const long _vq_quantmap__44c0_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c0_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c0_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c0_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p4_0,
-        NULL,
         0
 };
 
@@ -14694,32 +11098,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44c0_s_p5_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c0_s_p5_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c0_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p5_0,
-        NULL,
         0
 };
 
@@ -14738,29 +11121,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44c0_s_p6_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c0_s_p6_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c0_s_p6_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c0_s_p6_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c0_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p6_0,
-        NULL,
         0
 };
 
@@ -14789,31 +11154,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c0_s_p6_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c0_s_p6_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c0_s_p6_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c0_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p6_1,
-        NULL,
         0
 };
 
@@ -14847,31 +11192,11 @@
          0,12,12,11,11,12,12,13,13,
 };
 
-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 const long _vq_quantmap__44c0_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c0_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c0_s_p7_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c0_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p7_0,
-        NULL,
         0
 };
 
@@ -14888,29 +11213,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c0_s_p7_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c0_s_p7_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c0_s_p7_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c0_s_p7_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c0_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p7_1,
-        NULL,
         0
 };
 
@@ -14965,29 +11272,11 @@
         11,
 };
 
-static const float _vq_quantthresh__44c0_s_p8_0[] = {
-        -331.5, -110.5, 110.5, 331.5, 
-};
-
-static const long _vq_quantmap__44c0_s_p8_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c0_s_p8_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c0_s_p8_0,
         1, -518283264, 1627103232, 3, 0,
         (long *)_vq_quantlist__44c0_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_0,
-        NULL,
         0
 };
 
@@ -15021,31 +11310,11 @@
         16,13,13,12,12,14,14,15,13,
 };
 
-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 const long _vq_quantmap__44c0_s_p8_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c0_s_p8_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c0_s_p8_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44c0_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_1,
-        NULL,
         0
 };
 
@@ -15091,32 +11360,11 @@
         10,
 };
 
-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 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 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 const static_codebook _44c0_s_p8_2 = {
         2, 289,
         (long *)_vq_lengthlist__44c0_s_p8_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c0_s_p8_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_2,
-        NULL,
         0
 };
 
@@ -15134,9 +11382,6 @@
         (long *)_huff_lengthlist__44c0_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -15154,9 +11399,6 @@
         (long *)_huff_lengthlist__44c0_sm_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -15580,29 +11822,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c0_sm_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c0_sm_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c0_sm_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c0_sm_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c0_sm_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p1_0,
-        NULL,
         0
 };
 
@@ -15657,29 +11881,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c0_sm_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c0_sm_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c0_sm_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c0_sm_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c0_sm_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p2_0,
-        NULL,
         0
 };
 
@@ -15704,30 +11910,11 @@
          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 const long _vq_quantmap__44c0_sm_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c0_sm_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c0_sm_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c0_sm_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p3_0,
-        NULL,
         0
 };
 
@@ -15752,30 +11939,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44c0_sm_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c0_sm_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c0_sm_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c0_sm_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p4_0,
-        NULL,
         0
 };
 
@@ -15821,32 +11989,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44c0_sm_p5_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c0_sm_p5_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c0_sm_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p5_0,
-        NULL,
         0
 };
 
@@ -15865,29 +12012,11 @@
         11,
 };
 
-static const float _vq_quantthresh__44c0_sm_p6_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c0_sm_p6_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c0_sm_p6_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c0_sm_p6_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c0_sm_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p6_0,
-        NULL,
         0
 };
 
@@ -15916,31 +12045,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c0_sm_p6_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c0_sm_p6_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c0_sm_p6_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c0_sm_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p6_1,
-        NULL,
         0
 };
 
@@ -15974,31 +12083,11 @@
          0,12,12,11,11,13,12,14,14,
 };
 
-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 const long _vq_quantmap__44c0_sm_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c0_sm_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c0_sm_p7_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c0_sm_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p7_0,
-        NULL,
         0
 };
 
@@ -16015,29 +12104,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c0_sm_p7_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c0_sm_p7_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c0_sm_p7_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c0_sm_p7_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c0_sm_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p7_1,
-        NULL,
         0
 };
 
@@ -16062,30 +12133,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44c0_sm_p8_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c0_sm_p8_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c0_sm_p8_0,
         1, -516186112, 1627103232, 4, 0,
         (long *)_vq_quantlist__44c0_sm_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_0,
-        NULL,
         0
 };
 
@@ -16119,31 +12171,11 @@
         20,13,13,12,12,16,13,15,13,
 };
 
-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 const long _vq_quantmap__44c0_sm_p8_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c0_sm_p8_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c0_sm_p8_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44c0_sm_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_1,
-        NULL,
         0
 };
 
@@ -16189,32 +12221,11 @@
          9,
 };
 
-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 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 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 const static_codebook _44c0_sm_p8_2 = {
         2, 289,
         (long *)_vq_lengthlist__44c0_sm_p8_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c0_sm_p8_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_2,
-        NULL,
         0
 };
 
@@ -16232,9 +12243,6 @@
         (long *)_huff_lengthlist__44c0_sm_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -16252,9 +12260,6 @@
         (long *)_huff_lengthlist__44c1_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -16678,29 +12683,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c1_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c1_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c1_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c1_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c1_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p1_0,
-        NULL,
         0
 };
 
@@ -16755,29 +12742,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c1_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c1_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c1_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c1_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c1_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p2_0,
-        NULL,
         0
 };
 
@@ -16802,30 +12771,11 @@
          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 const long _vq_quantmap__44c1_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c1_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c1_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c1_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p3_0,
-        NULL,
         0
 };
 
@@ -16850,30 +12800,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44c1_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c1_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c1_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c1_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p4_0,
-        NULL,
         0
 };
 
@@ -16919,32 +12850,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44c1_s_p5_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c1_s_p5_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c1_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p5_0,
-        NULL,
         0
 };
 
@@ -16963,29 +12873,11 @@
         11,
 };
 
-static const float _vq_quantthresh__44c1_s_p6_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c1_s_p6_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c1_s_p6_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c1_s_p6_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c1_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p6_0,
-        NULL,
         0
 };
 
@@ -17014,31 +12906,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c1_s_p6_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c1_s_p6_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c1_s_p6_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c1_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p6_1,
-        NULL,
         0
 };
 
@@ -17072,31 +12944,11 @@
          0,12,11,11,11,13,10,14,13,
 };
 
-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 const long _vq_quantmap__44c1_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c1_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c1_s_p7_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c1_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p7_0,
-        NULL,
         0
 };
 
@@ -17113,29 +12965,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c1_s_p7_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c1_s_p7_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c1_s_p7_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c1_s_p7_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c1_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p7_1,
-        NULL,
         0
 };
 
@@ -17169,31 +13003,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 const long _vq_quantmap__44c1_s_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c1_s_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c1_s_p8_0,
         1, -514541568, 1627103232, 4, 0,
         (long *)_vq_quantlist__44c1_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_0,
-        NULL,
         0
 };
 
@@ -17227,31 +13041,11 @@
         16,13,12,12,11,14,12,15,13,
 };
 
-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 const long _vq_quantmap__44c1_s_p8_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c1_s_p8_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c1_s_p8_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44c1_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_1,
-        NULL,
         0
 };
 
@@ -17297,32 +13091,11 @@
          9,
 };
 
-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 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 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 const static_codebook _44c1_s_p8_2 = {
         2, 289,
         (long *)_vq_lengthlist__44c1_s_p8_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c1_s_p8_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_2,
-        NULL,
         0
 };
 
@@ -17340,9 +13113,6 @@
         (long *)_huff_lengthlist__44c1_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -17360,9 +13130,6 @@
         (long *)_huff_lengthlist__44c1_sm_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -17786,29 +13553,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c1_sm_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44c1_sm_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c1_sm_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44c1_sm_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44c1_sm_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p1_0,
-        NULL,
         0
 };
 
@@ -17863,29 +13612,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44c1_sm_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c1_sm_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c1_sm_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44c1_sm_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c1_sm_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p2_0,
-        NULL,
         0
 };
 
@@ -17910,30 +13641,11 @@
          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 const long _vq_quantmap__44c1_sm_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c1_sm_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c1_sm_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c1_sm_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p3_0,
-        NULL,
         0
 };
 
@@ -17958,30 +13670,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44c1_sm_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44c1_sm_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44c1_sm_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c1_sm_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p4_0,
-        NULL,
         0
 };
 
@@ -18027,32 +13720,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44c1_sm_p5_0 = {
         2, 289,
         (long *)_vq_lengthlist__44c1_sm_p5_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c1_sm_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p5_0,
-        NULL,
         0
 };
 
@@ -18071,29 +13743,11 @@
         11,
 };
 
-static const float _vq_quantthresh__44c1_sm_p6_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44c1_sm_p6_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44c1_sm_p6_0 = {
         4, 81,
         (long *)_vq_lengthlist__44c1_sm_p6_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44c1_sm_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p6_0,
-        NULL,
         0
 };
 
@@ -18122,31 +13776,11 @@
         10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44c1_sm_p6_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44c1_sm_p6_1 = {
         2, 121,
         (long *)_vq_lengthlist__44c1_sm_p6_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44c1_sm_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p6_1,
-        NULL,
         0
 };
 
@@ -18180,31 +13814,11 @@
          0,12,12,11,11,13,12,14,13,
 };
 
-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 const long _vq_quantmap__44c1_sm_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c1_sm_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c1_sm_p7_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44c1_sm_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p7_0,
-        NULL,
         0
 };
 
@@ -18221,29 +13835,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44c1_sm_p7_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44c1_sm_p7_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44c1_sm_p7_1 = {
         2, 25,
         (long *)_vq_lengthlist__44c1_sm_p7_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44c1_sm_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p7_1,
-        NULL,
         0
 };
 
@@ -18277,31 +13873,11 @@
         13,13,13,13,13,13,13,13,13,
 };
 
-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 const long _vq_quantmap__44c1_sm_p8_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c1_sm_p8_0 = {
         2, 169,
         (long *)_vq_lengthlist__44c1_sm_p8_0,
         1, -514541568, 1627103232, 4, 0,
         (long *)_vq_quantlist__44c1_sm_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_0,
-        NULL,
         0
 };
 
@@ -18335,31 +13911,11 @@
         20,13,12,12,12,14,12,14,13,
 };
 
-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 const long _vq_quantmap__44c1_sm_p8_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44c1_sm_p8_1 = {
         2, 169,
         (long *)_vq_lengthlist__44c1_sm_p8_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44c1_sm_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_1,
-        NULL,
         0
 };
 
@@ -18405,32 +13961,11 @@
          9,
 };
 
-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 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 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 const static_codebook _44c1_sm_p8_2 = {
         2, 289,
         (long *)_vq_lengthlist__44c1_sm_p8_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44c1_sm_p8_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_2,
-        NULL,
         0
 };
 
@@ -18448,9 +13983,6 @@
         (long *)_huff_lengthlist__44c1_sm_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -18468,9 +14000,6 @@
         (long *)_huff_lengthlist__44cn1_s_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -18894,29 +14423,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44cn1_s_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44cn1_s_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44cn1_s_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44cn1_s_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44cn1_s_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p1_0,
-        NULL,
         0
 };
 
@@ -18971,29 +14482,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44cn1_s_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44cn1_s_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44cn1_s_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44cn1_s_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44cn1_s_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p2_0,
-        NULL,
         0
 };
 
@@ -19018,30 +14511,11 @@
          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 const long _vq_quantmap__44cn1_s_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44cn1_s_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44cn1_s_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44cn1_s_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p3_0,
-        NULL,
         0
 };
 
@@ -19066,30 +14540,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44cn1_s_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44cn1_s_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44cn1_s_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44cn1_s_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p4_0,
-        NULL,
         0
 };
 
@@ -19135,32 +14590,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44cn1_s_p5_0 = {
         2, 289,
         (long *)_vq_lengthlist__44cn1_s_p5_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44cn1_s_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p5_0,
-        NULL,
         0
 };
 
@@ -19179,29 +14613,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44cn1_s_p6_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44cn1_s_p6_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44cn1_s_p6_0 = {
         4, 81,
         (long *)_vq_lengthlist__44cn1_s_p6_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44cn1_s_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p6_0,
-        NULL,
         0
 };
 
@@ -19230,31 +14646,11 @@
         10,10,10, 9, 9, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__44cn1_s_p6_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44cn1_s_p6_1 = {
         2, 121,
         (long *)_vq_lengthlist__44cn1_s_p6_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44cn1_s_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p6_1,
-        NULL,
         0
 };
 
@@ -19288,31 +14684,11 @@
          0,13,13,12,12,13,13,13,14,
 };
 
-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 const long _vq_quantmap__44cn1_s_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44cn1_s_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44cn1_s_p7_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44cn1_s_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p7_0,
-        NULL,
         0
 };
 
@@ -19329,29 +14705,11 @@
          6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44cn1_s_p7_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44cn1_s_p7_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44cn1_s_p7_1 = {
         2, 25,
         (long *)_vq_lengthlist__44cn1_s_p7_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44cn1_s_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p7_1,
-        NULL,
         0
 };
 
@@ -19406,29 +14764,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44cn1_s_p8_0[] = {
-        -331.5, -110.5, 110.5, 331.5, 
-};
-
-static const long _vq_quantmap__44cn1_s_p8_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44cn1_s_p8_0 = {
         4, 625,
         (long *)_vq_lengthlist__44cn1_s_p8_0,
         1, -518283264, 1627103232, 3, 0,
         (long *)_vq_quantlist__44cn1_s_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_0,
-        NULL,
         0
 };
 
@@ -19462,31 +14802,11 @@
         15,12,12,11,11,14,12,13,14,
 };
 
-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 const long _vq_quantmap__44cn1_s_p8_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44cn1_s_p8_1 = {
         2, 169,
         (long *)_vq_lengthlist__44cn1_s_p8_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44cn1_s_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_1,
-        NULL,
         0
 };
 
@@ -19532,32 +14852,11 @@
          9,
 };
 
-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 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 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 const static_codebook _44cn1_s_p8_2 = {
         2, 289,
         (long *)_vq_lengthlist__44cn1_s_p8_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44cn1_s_p8_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_2,
-        NULL,
         0
 };
 
@@ -19575,9 +14874,6 @@
         (long *)_huff_lengthlist__44cn1_s_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -19595,9 +14891,6 @@
         (long *)_huff_lengthlist__44cn1_sm_long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -20021,29 +15314,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44cn1_sm_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44cn1_sm_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44cn1_sm_p1_0 = {
         8, 6561,
         (long *)_vq_lengthlist__44cn1_sm_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44cn1_sm_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p1_0,
-        NULL,
         0
 };
 
@@ -20098,29 +15373,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44cn1_sm_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44cn1_sm_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44cn1_sm_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44cn1_sm_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44cn1_sm_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p2_0,
-        NULL,
         0
 };
 
@@ -20145,30 +15402,11 @@
          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 const long _vq_quantmap__44cn1_sm_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44cn1_sm_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44cn1_sm_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44cn1_sm_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p3_0,
-        NULL,
         0
 };
 
@@ -20193,30 +15431,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44cn1_sm_p4_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44cn1_sm_p4_0 = {
         2, 81,
         (long *)_vq_lengthlist__44cn1_sm_p4_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44cn1_sm_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p4_0,
-        NULL,
         0
 };
 
@@ -20262,32 +15481,11 @@
         14,
 };
 
-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 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 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 const static_codebook _44cn1_sm_p5_0 = {
         2, 289,
         (long *)_vq_lengthlist__44cn1_sm_p5_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44cn1_sm_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p5_0,
-        NULL,
         0
 };
 
@@ -20306,29 +15504,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44cn1_sm_p6_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44cn1_sm_p6_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44cn1_sm_p6_0 = {
         4, 81,
         (long *)_vq_lengthlist__44cn1_sm_p6_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44cn1_sm_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p6_0,
-        NULL,
         0
 };
 
@@ -20357,31 +15537,11 @@
         10,10,10, 8, 9, 8, 8, 9, 8,
 };
 
-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 const long _vq_quantmap__44cn1_sm_p6_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44cn1_sm_p6_1 = {
         2, 121,
         (long *)_vq_lengthlist__44cn1_sm_p6_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44cn1_sm_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p6_1,
-        NULL,
         0
 };
 
@@ -20415,31 +15575,11 @@
          0,13,12,12,12,13,13,13,14,
 };
 
-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 const long _vq_quantmap__44cn1_sm_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44cn1_sm_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44cn1_sm_p7_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44cn1_sm_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p7_0,
-        NULL,
         0
 };
 
@@ -20456,29 +15596,11 @@
          5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
-static const float _vq_quantthresh__44cn1_sm_p7_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44cn1_sm_p7_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44cn1_sm_p7_1 = {
         2, 25,
         (long *)_vq_lengthlist__44cn1_sm_p7_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44cn1_sm_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p7_1,
-        NULL,
         0
 };
 
@@ -20503,30 +15625,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44cn1_sm_p8_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44cn1_sm_p8_0 = {
         2, 81,
         (long *)_vq_lengthlist__44cn1_sm_p8_0,
         1, -516186112, 1627103232, 4, 0,
         (long *)_vq_quantlist__44cn1_sm_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_0,
-        NULL,
         0
 };
 
@@ -20560,31 +15663,11 @@
         17,12,12,11,10,13,11,13,13,
 };
 
-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 const long _vq_quantmap__44cn1_sm_p8_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44cn1_sm_p8_1 = {
         2, 169,
         (long *)_vq_lengthlist__44cn1_sm_p8_1,
         1, -522616832, 1620115456, 4, 0,
         (long *)_vq_quantlist__44cn1_sm_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_1,
-        NULL,
         0
 };
 
@@ -20630,32 +15713,11 @@
          9,
 };
 
-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 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 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 const static_codebook _44cn1_sm_p8_2 = {
         2, 289,
         (long *)_vq_lengthlist__44cn1_sm_p8_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44cn1_sm_p8_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_2,
-        NULL,
         0
 };
 
@@ -20673,9 +15735,6 @@
         (long *)_huff_lengthlist__44cn1_sm_short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 

Modified: trunk/vorbis/lib/books/floor/floor_books.h
===================================================================
--- trunk/vorbis/lib/books/floor/floor_books.h	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/books/floor/floor_books.h	2010-03-01 08:38:14 UTC (rev 16939)
@@ -26,9 +26,6 @@
         (long *)_huff_lengthlist_line_256x7_0sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -42,9 +39,6 @@
         (long *)_huff_lengthlist_line_256x7_0sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -60,9 +54,6 @@
         (long *)_huff_lengthlist_line_256x7_0sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -75,9 +66,6 @@
         (long *)_huff_lengthlist_line_256x7_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -91,9 +79,6 @@
         (long *)_huff_lengthlist_line_256x7_1sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -109,9 +94,6 @@
         (long *)_huff_lengthlist_line_256x7_1sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -127,9 +109,6 @@
         (long *)_huff_lengthlist_line_256x7_class0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -157,9 +136,6 @@
         (long *)_huff_lengthlist_line_256x7_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -179,9 +155,6 @@
         (long *)_huff_lengthlist_line_512x17_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -195,9 +168,6 @@
         (long *)_huff_lengthlist_line_512x17_1sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -217,9 +187,6 @@
         (long *)_huff_lengthlist_line_512x17_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -233,9 +200,6 @@
         (long *)_huff_lengthlist_line_512x17_2sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -251,9 +215,6 @@
         (long *)_huff_lengthlist_line_512x17_2sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -273,9 +234,6 @@
         (long *)_huff_lengthlist_line_512x17_2sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -289,9 +247,6 @@
         (long *)_huff_lengthlist_line_512x17_3sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -307,9 +262,6 @@
         (long *)_huff_lengthlist_line_512x17_3sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -329,9 +281,6 @@
         (long *)_huff_lengthlist_line_512x17_3sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -344,9 +293,6 @@
         (long *)_huff_lengthlist_line_512x17_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -362,9 +308,6 @@
         (long *)_huff_lengthlist_line_512x17_class2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -380,9 +323,6 @@
         (long *)_huff_lengthlist_line_512x17_class3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -410,9 +350,6 @@
         (long *)_huff_lengthlist_line_128x4_class0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -425,9 +362,6 @@
         (long *)_huff_lengthlist_line_128x4_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -440,9 +374,6 @@
         (long *)_huff_lengthlist_line_128x4_0sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -456,9 +387,6 @@
         (long *)_huff_lengthlist_line_128x4_0sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -474,9 +402,6 @@
         (long *)_huff_lengthlist_line_128x4_0sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -504,9 +429,6 @@
         (long *)_huff_lengthlist_line_256x4_class0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -519,9 +441,6 @@
         (long *)_huff_lengthlist_line_256x4_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -534,9 +453,6 @@
         (long *)_huff_lengthlist_line_256x4_0sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -550,9 +466,6 @@
         (long *)_huff_lengthlist_line_256x4_0sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -568,9 +481,6 @@
         (long *)_huff_lengthlist_line_256x4_0sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -586,9 +496,6 @@
         (long *)_huff_lengthlist_line_128x7_class0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -616,9 +523,6 @@
         (long *)_huff_lengthlist_line_128x7_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -631,9 +535,6 @@
         (long *)_huff_lengthlist_line_128x7_0sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -647,9 +548,6 @@
         (long *)_huff_lengthlist_line_128x7_0sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -665,9 +563,6 @@
         (long *)_huff_lengthlist_line_128x7_0sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -680,9 +575,6 @@
         (long *)_huff_lengthlist_line_128x7_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -696,9 +588,6 @@
         (long *)_huff_lengthlist_line_128x7_1sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -714,9 +603,6 @@
         (long *)_huff_lengthlist_line_128x7_1sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -729,9 +615,6 @@
         (long *)_huff_lengthlist_line_128x11_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -747,9 +630,6 @@
         (long *)_huff_lengthlist_line_128x11_class2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -765,9 +645,6 @@
         (long *)_huff_lengthlist_line_128x11_class3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -787,9 +664,6 @@
         (long *)_huff_lengthlist_line_128x11_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -803,9 +677,6 @@
         (long *)_huff_lengthlist_line_128x11_1sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -825,9 +696,6 @@
         (long *)_huff_lengthlist_line_128x11_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -841,9 +709,6 @@
         (long *)_huff_lengthlist_line_128x11_2sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -859,9 +724,6 @@
         (long *)_huff_lengthlist_line_128x11_2sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -881,9 +743,6 @@
         (long *)_huff_lengthlist_line_128x11_2sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -897,9 +756,6 @@
         (long *)_huff_lengthlist_line_128x11_3sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -915,9 +771,6 @@
         (long *)_huff_lengthlist_line_128x11_3sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -937,9 +790,6 @@
         (long *)_huff_lengthlist_line_128x11_3sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -952,9 +802,6 @@
         (long *)_huff_lengthlist_line_128x17_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -970,9 +817,6 @@
         (long *)_huff_lengthlist_line_128x17_class2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -988,9 +832,6 @@
         (long *)_huff_lengthlist_line_128x17_class3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1010,9 +851,6 @@
         (long *)_huff_lengthlist_line_128x17_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1026,9 +864,6 @@
         (long *)_huff_lengthlist_line_128x17_1sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1048,9 +883,6 @@
         (long *)_huff_lengthlist_line_128x17_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1064,9 +896,6 @@
         (long *)_huff_lengthlist_line_128x17_2sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1082,9 +911,6 @@
         (long *)_huff_lengthlist_line_128x17_2sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1104,9 +930,6 @@
         (long *)_huff_lengthlist_line_128x17_2sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1120,9 +943,6 @@
         (long *)_huff_lengthlist_line_128x17_3sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1138,9 +958,6 @@
         (long *)_huff_lengthlist_line_128x17_3sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1160,9 +977,6 @@
         (long *)_huff_lengthlist_line_128x17_3sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1175,9 +989,6 @@
         (long *)_huff_lengthlist_line_1024x27_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1190,9 +1001,6 @@
         (long *)_huff_lengthlist_line_1024x27_class2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1220,9 +1028,6 @@
         (long *)_huff_lengthlist_line_1024x27_class3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1238,9 +1043,6 @@
         (long *)_huff_lengthlist_line_1024x27_class4,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1260,9 +1062,6 @@
         (long *)_huff_lengthlist_line_1024x27_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1276,9 +1075,6 @@
         (long *)_huff_lengthlist_line_1024x27_1sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1298,9 +1094,6 @@
         (long *)_huff_lengthlist_line_1024x27_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1314,9 +1107,6 @@
         (long *)_huff_lengthlist_line_1024x27_2sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1336,9 +1126,6 @@
         (long *)_huff_lengthlist_line_1024x27_2sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1352,9 +1139,6 @@
         (long *)_huff_lengthlist_line_1024x27_3sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1370,9 +1154,6 @@
         (long *)_huff_lengthlist_line_1024x27_3sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1392,9 +1173,6 @@
         (long *)_huff_lengthlist_line_1024x27_3sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1408,9 +1186,6 @@
         (long *)_huff_lengthlist_line_1024x27_4sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1426,9 +1201,6 @@
         (long *)_huff_lengthlist_line_1024x27_4sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1448,9 +1220,6 @@
         (long *)_huff_lengthlist_line_1024x27_4sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1463,9 +1232,6 @@
         (long *)_huff_lengthlist_line_2048x27_class1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1478,9 +1244,6 @@
         (long *)_huff_lengthlist_line_2048x27_class2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1508,9 +1271,6 @@
         (long *)_huff_lengthlist_line_2048x27_class3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1526,9 +1286,6 @@
         (long *)_huff_lengthlist_line_2048x27_class4,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1548,9 +1305,6 @@
         (long *)_huff_lengthlist_line_2048x27_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1564,9 +1318,6 @@
         (long *)_huff_lengthlist_line_2048x27_1sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1586,9 +1337,6 @@
         (long *)_huff_lengthlist_line_2048x27_1sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1602,9 +1350,6 @@
         (long *)_huff_lengthlist_line_2048x27_2sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1624,9 +1369,6 @@
         (long *)_huff_lengthlist_line_2048x27_2sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1640,9 +1382,6 @@
         (long *)_huff_lengthlist_line_2048x27_3sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1658,9 +1397,6 @@
         (long *)_huff_lengthlist_line_2048x27_3sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1680,9 +1416,6 @@
         (long *)_huff_lengthlist_line_2048x27_3sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1696,9 +1429,6 @@
         (long *)_huff_lengthlist_line_2048x27_4sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1714,9 +1444,6 @@
         (long *)_huff_lengthlist_line_2048x27_4sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1736,9 +1463,6 @@
         (long *)_huff_lengthlist_line_2048x27_4sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1766,9 +1490,6 @@
         (long *)_huff_lengthlist_line_256x4low_class0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1781,9 +1502,6 @@
         (long *)_huff_lengthlist_line_256x4low_0sub0,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1796,9 +1514,6 @@
         (long *)_huff_lengthlist_line_256x4low_0sub1,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1812,9 +1527,6 @@
         (long *)_huff_lengthlist_line_256x4low_0sub2,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1830,9 +1542,6 @@
         (long *)_huff_lengthlist_line_256x4low_0sub3,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 

Modified: trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h
===================================================================
--- trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/books/uncoupled/res_books_uncoupled.h	2010-03-01 08:38:14 UTC (rev 16939)
@@ -31,29 +31,11 @@
         12,
 };
 
-static const float _vq_quantthresh__16u0__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16u0__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u0__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u0__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16u0__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p1_0,
-        NULL,
         0
 };
 
@@ -72,29 +54,11 @@
          8,
 };
 
-static const float _vq_quantthresh__16u0__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16u0__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u0__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u0__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16u0__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p2_0,
-        NULL,
         0
 };
 
@@ -149,29 +113,11 @@
         18,
 };
 
-static const float _vq_quantthresh__16u0__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u0__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u0__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__16u0__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u0__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p3_0,
-        NULL,
         0
 };
 
@@ -226,29 +172,11 @@
         11,
 };
 
-static const float _vq_quantthresh__16u0__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u0__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u0__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__16u0__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u0__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p4_0,
-        NULL,
         0
 };
 
@@ -273,30 +201,11 @@
         12,
 };
 
-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 const long _vq_quantmap__16u0__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16u0__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__16u0__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u0__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p5_0,
-        NULL,
         0
 };
 
@@ -330,31 +239,11 @@
         18, 0,19, 0, 0, 0, 0, 0, 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 const long _vq_quantmap__16u0__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16u0__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__16u0__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__16u0__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p6_0,
-        NULL,
         0
 };
 
@@ -371,29 +260,11 @@
          6, 6, 7, 7, 6, 6, 6, 7, 7,
 };
 
-static const float _vq_quantthresh__16u0__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u0__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u0__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__16u0__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u0__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p6_1,
-        NULL,
         0
 };
 
@@ -412,29 +283,11 @@
          7,
 };
 
-static const float _vq_quantthresh__16u0__p7_0[] = {
-        -157.5, 157.5, 
-};
-
-static const long _vq_quantmap__16u0__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u0__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u0__p7_0,
         1, -518803456, 1628680192, 2, 0,
         (long *)_vq_quantlist__16u0__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p7_0,
-        NULL,
         0
 };
 
@@ -474,31 +327,11 @@
         10,
 };
 
-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 const long _vq_quantmap__16u0__p7_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16u0__p7_1 = {
         2, 225,
         (long *)_vq_lengthlist__16u0__p7_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__16u0__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p7_1,
-        NULL,
         0
 };
 
@@ -557,33 +390,11 @@
         10,10,12,11,10,11,11,11,10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__16u0__p7_2 = {
-        (float *)_vq_quantthresh__16u0__p7_2,
-        (long *)_vq_quantmap__16u0__p7_2,
-        21,
-        21
-};
-
 static const static_codebook _16u0__p7_2 = {
         2, 441,
         (long *)_vq_lengthlist__16u0__p7_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__16u0__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u0__p7_2,
-        NULL,
         0
 };
 
@@ -599,9 +410,6 @@
         (long *)_huff_lengthlist__16u0__single,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -620,9 +428,6 @@
         (long *)_huff_lengthlist__16u1__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -641,29 +446,11 @@
         11,
 };
 
-static const float _vq_quantthresh__16u1__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16u1__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u1__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u1__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16u1__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p1_0,
-        NULL,
         0
 };
 
@@ -682,29 +469,11 @@
          8,
 };
 
-static const float _vq_quantthresh__16u1__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16u1__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u1__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u1__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16u1__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p2_0,
-        NULL,
         0
 };
 
@@ -759,29 +528,11 @@
         16,
 };
 
-static const float _vq_quantthresh__16u1__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u1__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u1__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__16u1__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u1__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p3_0,
-        NULL,
         0
 };
 
@@ -836,29 +587,11 @@
         11,
 };
 
-static const float _vq_quantthresh__16u1__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u1__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u1__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__16u1__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u1__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p4_0,
-        NULL,
         0
 };
 
@@ -883,30 +616,11 @@
         13,
 };
 
-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 const long _vq_quantmap__16u1__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16u1__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__16u1__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u1__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p5_0,
-        NULL,
         0
 };
 
@@ -931,30 +645,11 @@
         11,
 };
 
-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 const long _vq_quantmap__16u1__p6_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16u1__p6_0 = {
         2, 81,
         (long *)_vq_lengthlist__16u1__p6_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u1__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p6_0,
-        NULL,
         0
 };
 
@@ -973,29 +668,11 @@
         13,
 };
 
-static const float _vq_quantthresh__16u1__p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__16u1__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u1__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u1__p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__16u1__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p7_0,
-        NULL,
         0
 };
 
@@ -1024,31 +701,11 @@
          8, 9, 9,10,10,10,10,10,10,
 };
 
-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 const long _vq_quantmap__16u1__p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16u1__p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__16u1__p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u1__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p7_1,
-        NULL,
         0
 };
 
@@ -1077,31 +734,11 @@
         13,14,14,15,15,16,16,15,16,
 };
 
-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 const long _vq_quantmap__16u1__p8_0[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16u1__p8_0 = {
         2, 121,
         (long *)_vq_lengthlist__16u1__p8_0,
         1, -524582912, 1618345984, 4, 0,
         (long *)_vq_quantlist__16u1__p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p8_0,
-        NULL,
         0
 };
 
@@ -1130,31 +767,11 @@
          8, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__16u1__p8_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16u1__p8_1 = {
         2, 121,
         (long *)_vq_lengthlist__16u1__p8_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u1__p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p8_1,
-        NULL,
         0
 };
 
@@ -1194,31 +811,11 @@
          8,
 };
 
-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 const long _vq_quantmap__16u1__p9_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16u1__p9_0 = {
         2, 225,
         (long *)_vq_lengthlist__16u1__p9_0,
         1, -514071552, 1627381760, 4, 0,
         (long *)_vq_quantlist__16u1__p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p9_0,
-        NULL,
         0
 };
 
@@ -1258,31 +855,11 @@
          9,
 };
 
-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 const long _vq_quantmap__16u1__p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16u1__p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__16u1__p9_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__16u1__p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p9_1,
-        NULL,
         0
 };
 
@@ -1328,32 +905,11 @@
         10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__16u1__p9_2 = {
-        (float *)_vq_quantthresh__16u1__p9_2,
-        (long *)_vq_quantmap__16u1__p9_2,
-        17,
-        17
-};
-
 static const static_codebook _16u1__p9_2 = {
         2, 289,
         (long *)_vq_lengthlist__16u1__p9_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__16u1__p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u1__p9_2,
-        NULL,
         0
 };
 
@@ -1372,9 +928,6 @@
         (long *)_huff_lengthlist__16u1__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1393,9 +946,6 @@
         (long *)_huff_lengthlist__16u2__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1414,9 +964,6 @@
         (long *)_huff_lengthlist__16u2__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -1435,29 +982,11 @@
         10,
 };
 
-static const float _vq_quantthresh__16u2_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__16u2_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u2_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u2_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__16u2_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p1_0,
-        NULL,
         0
 };
 
@@ -1512,29 +1041,11 @@
         13,
 };
 
-static const float _vq_quantthresh__16u2_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u2_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u2_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__16u2_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u2_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p2_0,
-        NULL,
         0
 };
 
@@ -1559,30 +1070,11 @@
         11,
 };
 
-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 const long _vq_quantmap__16u2_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _16u2_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__16u2_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u2_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p3_0,
-        NULL,
         0
 };
 
@@ -1628,32 +1120,11 @@
         14,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__16u2_p4_0 = {
-        (float *)_vq_quantthresh__16u2_p4_0,
-        (long *)_vq_quantmap__16u2_p4_0,
-        17,
-        17
-};
-
 static const static_codebook _16u2_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__16u2_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__16u2_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p4_0,
-        NULL,
         0
 };
 
@@ -1672,29 +1143,11 @@
         10,
 };
 
-static const float _vq_quantthresh__16u2_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__16u2_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _16u2_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__16u2_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__16u2_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p5_0,
-        NULL,
         0
 };
 
@@ -1723,31 +1176,11 @@
          8, 8, 8, 9, 9, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__16u2_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16u2_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__16u2_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u2_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p5_1,
-        NULL,
         0
 };
 
@@ -1781,31 +1214,11 @@
         12,13,13,14,14,14,14,15,15,
 };
 
-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 const long _vq_quantmap__16u2_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16u2_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__16u2_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__16u2_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p6_0,
-        NULL,
         0
 };
 
@@ -1822,29 +1235,11 @@
          5, 5, 6, 6, 5, 5, 5, 6, 6,
 };
 
-static const float _vq_quantthresh__16u2_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__16u2_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _16u2_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__16u2_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__16u2_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p6_1,
-        NULL,
         0
 };
 
@@ -1878,31 +1273,11 @@
         12,13,13,13,14,14,14,15,14,
 };
 
-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 const long _vq_quantmap__16u2_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16u2_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__16u2_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__16u2_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p7_0,
-        NULL,
         0
 };
 
@@ -1931,31 +1306,11 @@
          8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__16u2_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _16u2_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__16u2_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__16u2_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p7_1,
-        NULL,
         0
 };
 
@@ -1995,31 +1350,11 @@
         14,
 };
 
-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 const long _vq_quantmap__16u2_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _16u2_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__16u2_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__16u2_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p8_0,
-        NULL,
         0
 };
 
@@ -2078,33 +1413,11 @@
         11,11,10,11,11,11,10,11,11,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__16u2_p8_1 = {
-        (float *)_vq_quantthresh__16u2_p8_1,
-        (long *)_vq_quantmap__16u2_p8_1,
-        21,
-        21
-};
-
 static const static_codebook _16u2_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__16u2_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__16u2_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p8_1,
-        NULL,
         0
 };
 
@@ -2144,31 +1457,11 @@
          5,
 };
 
-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 const long _vq_quantmap__16u2_p9_0[] = {
-           11,    9,    7,    5,    3,    1,   13,    0,
-           14,    2,    4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _16u2_p9_0 = {
         2, 225,
         (long *)_vq_lengthlist__16u2_p9_0,
         1, -510275072, 1611661312, 14, 0,
         (long *)_vq_quantlist__16u2_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p9_0,
-        NULL,
         0
 };
 
@@ -2220,33 +1513,11 @@
         11,11,11,11,11,11,11, 5, 4,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__16u2_p9_1 = {
-        (float *)_vq_quantthresh__16u2_p9_1,
-        (long *)_vq_quantmap__16u2_p9_1,
-        19,
-        19
-};
-
 static const static_codebook _16u2_p9_1 = {
         2, 361,
         (long *)_vq_lengthlist__16u2_p9_1,
         1, -518488064, 1611661312, 10, 0,
         (long *)_vq_quantlist__16u2_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p9_1,
-        NULL,
         0
 };
 
@@ -2309,40 +1580,11 @@
         11,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _16u2_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__16u2_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__16u2_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__16u2_p9_2,
-        NULL,
         0
 };
 
@@ -2361,29 +1603,11 @@
         11,
 };
 
-static const float _vq_quantthresh__8u0__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__8u0__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8u0__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__8u0__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__8u0__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p1_0,
-        NULL,
         0
 };
 
@@ -2402,29 +1626,11 @@
          8,
 };
 
-static const float _vq_quantthresh__8u0__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__8u0__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8u0__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__8u0__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__8u0__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p2_0,
-        NULL,
         0
 };
 
@@ -2479,29 +1685,11 @@
         16,
 };
 
-static const float _vq_quantthresh__8u0__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8u0__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8u0__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__8u0__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8u0__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p3_0,
-        NULL,
         0
 };
 
@@ -2556,29 +1744,11 @@
         12,
 };
 
-static const float _vq_quantthresh__8u0__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8u0__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8u0__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__8u0__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8u0__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p4_0,
-        NULL,
         0
 };
 
@@ -2603,30 +1773,11 @@
         12,
 };
 
-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 const long _vq_quantmap__8u0__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8u0__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__8u0__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8u0__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p5_0,
-        NULL,
         0
 };
 
@@ -2660,31 +1811,11 @@
         16, 0,15, 0,17, 0, 0, 0, 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 const long _vq_quantmap__8u0__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _8u0__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__8u0__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__8u0__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p6_0,
-        NULL,
         0
 };
 
@@ -2701,29 +1832,11 @@
          7, 7, 7, 7, 6, 7, 7, 7, 7,
 };
 
-static const float _vq_quantthresh__8u0__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8u0__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8u0__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__8u0__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8u0__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p6_1,
-        NULL,
         0
 };
 
@@ -2742,29 +1855,11 @@
          7,
 };
 
-static const float _vq_quantthresh__8u0__p7_0[] = {
-        -157.5, 157.5, 
-};
-
-static const long _vq_quantmap__8u0__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8u0__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__8u0__p7_0,
         1, -518803456, 1628680192, 2, 0,
         (long *)_vq_quantlist__8u0__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p7_0,
-        NULL,
         0
 };
 
@@ -2804,31 +1899,11 @@
         10,
 };
 
-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 const long _vq_quantmap__8u0__p7_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _8u0__p7_1 = {
         2, 225,
         (long *)_vq_lengthlist__8u0__p7_1,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__8u0__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p7_1,
-        NULL,
         0
 };
 
@@ -2887,33 +1962,11 @@
         11,12,11,11,11,10,10,11,11,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__8u0__p7_2 = {
-        (float *)_vq_quantthresh__8u0__p7_2,
-        (long *)_vq_quantmap__8u0__p7_2,
-        21,
-        21
-};
-
 static const static_codebook _8u0__p7_2 = {
         2, 441,
         (long *)_vq_lengthlist__8u0__p7_2,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__8u0__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u0__p7_2,
-        NULL,
         0
 };
 
@@ -2929,9 +1982,6 @@
         (long *)_huff_lengthlist__8u0__single,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -2950,29 +2000,11 @@
         10,
 };
 
-static const float _vq_quantthresh__8u1__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__8u1__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8u1__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__8u1__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__8u1__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p1_0,
-        NULL,
         0
 };
 
@@ -2991,29 +2023,11 @@
          7,
 };
 
-static const float _vq_quantthresh__8u1__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__8u1__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8u1__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__8u1__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__8u1__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p2_0,
-        NULL,
         0
 };
 
@@ -3068,29 +2082,11 @@
         16,
 };
 
-static const float _vq_quantthresh__8u1__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8u1__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8u1__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__8u1__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8u1__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p3_0,
-        NULL,
         0
 };
 
@@ -3145,29 +2141,11 @@
         10,
 };
 
-static const float _vq_quantthresh__8u1__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__8u1__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _8u1__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__8u1__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__8u1__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p4_0,
-        NULL,
         0
 };
 
@@ -3192,30 +2170,11 @@
         13,
 };
 
-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 const long _vq_quantmap__8u1__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8u1__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__8u1__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8u1__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p5_0,
-        NULL,
         0
 };
 
@@ -3240,30 +2199,11 @@
         10,
 };
 
-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 const long _vq_quantmap__8u1__p6_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _8u1__p6_0 = {
         2, 81,
         (long *)_vq_lengthlist__8u1__p6_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__8u1__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p6_0,
-        NULL,
         0
 };
 
@@ -3282,29 +2222,11 @@
         11,
 };
 
-static const float _vq_quantthresh__8u1__p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__8u1__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _8u1__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__8u1__p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__8u1__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p7_0,
-        NULL,
         0
 };
 
@@ -3333,31 +2255,11 @@
          9, 9, 9, 9, 9,10,10,10,10,
 };
 
-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 const long _vq_quantmap__8u1__p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _8u1__p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__8u1__p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__8u1__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p7_1,
-        NULL,
         0
 };
 
@@ -3386,31 +2288,11 @@
         12,13,13,14,14,15,15,15,15,
 };
 
-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 const long _vq_quantmap__8u1__p8_0[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _8u1__p8_0 = {
         2, 121,
         (long *)_vq_lengthlist__8u1__p8_0,
         1, -524582912, 1618345984, 4, 0,
         (long *)_vq_quantlist__8u1__p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p8_0,
-        NULL,
         0
 };
 
@@ -3439,31 +2321,11 @@
          8, 8, 8, 8, 8, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__8u1__p8_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _8u1__p8_1 = {
         2, 121,
         (long *)_vq_lengthlist__8u1__p8_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__8u1__p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p8_1,
-        NULL,
         0
 };
 
@@ -3503,31 +2365,11 @@
         10,
 };
 
-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 const long _vq_quantmap__8u1__p9_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _8u1__p9_0 = {
         2, 225,
         (long *)_vq_lengthlist__8u1__p9_0,
         1, -514071552, 1627381760, 4, 0,
         (long *)_vq_quantlist__8u1__p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p9_0,
-        NULL,
         0
 };
 
@@ -3567,31 +2409,11 @@
         13,
 };
 
-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 const long _vq_quantmap__8u1__p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _8u1__p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__8u1__p9_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__8u1__p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p9_1,
-        NULL,
         0
 };
 
@@ -3637,32 +2459,11 @@
         10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__8u1__p9_2 = {
-        (float *)_vq_quantthresh__8u1__p9_2,
-        (long *)_vq_quantmap__8u1__p9_2,
-        17,
-        17
-};
-
 static const static_codebook _8u1__p9_2 = {
         2, 289,
         (long *)_vq_lengthlist__8u1__p9_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__8u1__p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__8u1__p9_2,
-        NULL,
         0
 };
 
@@ -3681,9 +2482,6 @@
         (long *)_huff_lengthlist__8u1__single,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -3699,9 +2497,6 @@
         (long *)_huff_lengthlist__44u0__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -3720,29 +2515,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u0__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u0__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u0__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u0__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u0__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p1_0,
-        NULL,
         0
 };
 
@@ -3761,29 +2538,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u0__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u0__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u0__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u0__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u0__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p2_0,
-        NULL,
         0
 };
 
@@ -3838,29 +2597,11 @@
         19,
 };
 
-static const float _vq_quantthresh__44u0__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u0__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u0__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u0__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u0__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p3_0,
-        NULL,
         0
 };
 
@@ -3915,29 +2656,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u0__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u0__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u0__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u0__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u0__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p4_0,
-        NULL,
         0
 };
 
@@ -3962,30 +2685,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u0__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u0__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u0__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u0__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p5_0,
-        NULL,
         0
 };
 
@@ -4019,31 +2723,11 @@
         15,17,16,17,18,17,17,18, 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 const long _vq_quantmap__44u0__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u0__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u0__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u0__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p6_0,
-        NULL,
         0
 };
 
@@ -4060,29 +2744,11 @@
          6, 6, 6, 6, 5, 6, 6, 6, 6,
 };
 
-static const float _vq_quantthresh__44u0__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u0__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u0__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u0__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u0__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p6_1,
-        NULL,
         0
 };
 
@@ -4137,29 +2803,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u0__p7_0[] = {
-        -253.5, -84.5, 84.5, 253.5, 
-};
-
-static const long _vq_quantmap__44u0__p7_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u0__p7_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u0__p7_0,
         1, -518709248, 1626677248, 3, 0,
         (long *)_vq_quantlist__44u0__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p7_0,
-        NULL,
         0
 };
 
@@ -4193,31 +2841,11 @@
         15,15,15,15,15,15,15,15,15,
 };
 
-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 const long _vq_quantmap__44u0__p7_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u0__p7_1 = {
         2, 169,
         (long *)_vq_lengthlist__44u0__p7_1,
         1, -523010048, 1618608128, 4, 0,
         (long *)_vq_quantlist__44u0__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p7_1,
-        NULL,
         0
 };
 
@@ -4251,31 +2879,11 @@
          9, 9, 9,10, 9, 9,10,10, 9,
 };
 
-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 const long _vq_quantmap__44u0__p7_2[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u0__p7_2 = {
         2, 169,
         (long *)_vq_lengthlist__44u0__p7_2,
         1, -531103744, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u0__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u0__p7_2,
-        NULL,
         0
 };
 
@@ -4291,9 +2899,6 @@
         (long *)_huff_lengthlist__44u0__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -4309,9 +2914,6 @@
         (long *)_huff_lengthlist__44u1__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -4330,29 +2932,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u1__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u1__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u1__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u1__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u1__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p1_0,
-        NULL,
         0
 };
 
@@ -4371,29 +2955,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u1__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u1__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u1__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u1__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u1__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p2_0,
-        NULL,
         0
 };
 
@@ -4448,29 +3014,11 @@
         19,
 };
 
-static const float _vq_quantthresh__44u1__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u1__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u1__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u1__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u1__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p3_0,
-        NULL,
         0
 };
 
@@ -4525,29 +3073,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u1__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u1__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u1__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u1__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u1__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p4_0,
-        NULL,
         0
 };
 
@@ -4572,30 +3102,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u1__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u1__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u1__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u1__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p5_0,
-        NULL,
         0
 };
 
@@ -4629,31 +3140,11 @@
         15,17,16,17,18,17,17,18, 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 const long _vq_quantmap__44u1__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u1__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u1__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u1__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p6_0,
-        NULL,
         0
 };
 
@@ -4670,29 +3161,11 @@
          6, 6, 6, 6, 5, 6, 6, 6, 6,
 };
 
-static const float _vq_quantthresh__44u1__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u1__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u1__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u1__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u1__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p6_1,
-        NULL,
         0
 };
 
@@ -4713,29 +3186,11 @@
          8,
 };
 
-static const float _vq_quantthresh__44u1__p7_0[] = {
-        -422.5, -253.5, -84.5, 84.5, 253.5, 422.5, 
-};
-
-static const long _vq_quantmap__44u1__p7_0[] = {
-            5,    3,    1,    0,    2,    4,    6,
-};
-
-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 const static_codebook _44u1__p7_0 = {
         2, 49,
         (long *)_vq_lengthlist__44u1__p7_0,
         1, -518017024, 1626677248, 3, 0,
         (long *)_vq_quantlist__44u1__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p7_0,
-        NULL,
         0
 };
 
@@ -4769,31 +3224,11 @@
         15,15,15,15,15,15,15,15,15,
 };
 
-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 const long _vq_quantmap__44u1__p7_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u1__p7_1 = {
         2, 169,
         (long *)_vq_lengthlist__44u1__p7_1,
         1, -523010048, 1618608128, 4, 0,
         (long *)_vq_quantlist__44u1__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p7_1,
-        NULL,
         0
 };
 
@@ -4827,31 +3262,11 @@
          9, 9, 9,10, 9, 9,10,10, 9,
 };
 
-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 const long _vq_quantmap__44u1__p7_2[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u1__p7_2 = {
         2, 169,
         (long *)_vq_lengthlist__44u1__p7_2,
         1, -531103744, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u1__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u1__p7_2,
-        NULL,
         0
 };
 
@@ -4867,9 +3282,6 @@
         (long *)_huff_lengthlist__44u1__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -4885,9 +3297,6 @@
         (long *)_huff_lengthlist__44u2__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -4906,29 +3315,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u2__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u2__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u2__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u2__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u2__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p1_0,
-        NULL,
         0
 };
 
@@ -4947,29 +3338,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u2__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u2__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u2__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u2__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u2__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p2_0,
-        NULL,
         0
 };
 
@@ -5024,29 +3397,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44u2__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u2__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u2__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u2__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u2__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p3_0,
-        NULL,
         0
 };
 
@@ -5101,29 +3456,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u2__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u2__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u2__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u2__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u2__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p4_0,
-        NULL,
         0
 };
 
@@ -5148,30 +3485,11 @@
         13,
 };
 
-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 const long _vq_quantmap__44u2__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u2__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u2__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u2__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p5_0,
-        NULL,
         0
 };
 
@@ -5205,31 +3523,11 @@
         15,17,17,16,18,17,18, 0, 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 const long _vq_quantmap__44u2__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u2__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u2__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u2__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p6_0,
-        NULL,
         0
 };
 
@@ -5246,29 +3544,11 @@
          6, 5, 6, 6, 5, 5, 6, 6, 6,
 };
 
-static const float _vq_quantthresh__44u2__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u2__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u2__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u2__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u2__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p6_1,
-        NULL,
         0
 };
 
@@ -5293,30 +3573,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44u2__p7_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u2__p7_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u2__p7_0,
         1, -516612096, 1626677248, 4, 0,
         (long *)_vq_quantlist__44u2__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p7_0,
-        NULL,
         0
 };
 
@@ -5350,31 +3611,11 @@
         14,14,14,17,15,17,17,17,17,
 };
 
-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 const long _vq_quantmap__44u2__p7_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u2__p7_1 = {
         2, 169,
         (long *)_vq_lengthlist__44u2__p7_1,
         1, -523010048, 1618608128, 4, 0,
         (long *)_vq_quantlist__44u2__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p7_1,
-        NULL,
         0
 };
 
@@ -5408,31 +3649,11 @@
          9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__44u2__p7_2[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u2__p7_2 = {
         2, 169,
         (long *)_vq_lengthlist__44u2__p7_2,
         1, -531103744, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u2__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u2__p7_2,
-        NULL,
         0
 };
 
@@ -5448,9 +3669,6 @@
         (long *)_huff_lengthlist__44u2__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -5466,9 +3684,6 @@
         (long *)_huff_lengthlist__44u3__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -5487,29 +3702,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u3__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u3__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u3__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u3__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u3__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p1_0,
-        NULL,
         0
 };
 
@@ -5528,29 +3725,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u3__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u3__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u3__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u3__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u3__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p2_0,
-        NULL,
         0
 };
 
@@ -5605,29 +3784,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44u3__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u3__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u3__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u3__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u3__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p3_0,
-        NULL,
         0
 };
 
@@ -5682,29 +3843,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u3__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u3__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u3__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u3__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u3__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p4_0,
-        NULL,
         0
 };
 
@@ -5729,30 +3872,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u3__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u3__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u3__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u3__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p5_0,
-        NULL,
         0
 };
 
@@ -5786,31 +3910,11 @@
         15,16,16,16,17,18,16,20,18,
 };
 
-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 const long _vq_quantmap__44u3__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u3__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u3__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u3__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p6_0,
-        NULL,
         0
 };
 
@@ -5827,29 +3931,11 @@
          6, 5, 6, 6, 5, 5, 6, 6, 6,
 };
 
-static const float _vq_quantthresh__44u3__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u3__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u3__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u3__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u3__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p6_1,
-        NULL,
         0
 };
 
@@ -5874,30 +3960,11 @@
          9,
 };
 
-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 const long _vq_quantmap__44u3__p7_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u3__p7_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u3__p7_0,
         1, -515907584, 1627381760, 4, 0,
         (long *)_vq_quantlist__44u3__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p7_0,
-        NULL,
         0
 };
 
@@ -5937,31 +4004,11 @@
         17,
 };
 
-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 const long _vq_quantmap__44u3__p7_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u3__p7_1 = {
         2, 225,
         (long *)_vq_lengthlist__44u3__p7_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__44u3__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p7_1,
-        NULL,
         0
 };
 
@@ -6007,32 +4054,11 @@
         11,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u3__p7_2 = {
-        (float *)_vq_quantthresh__44u3__p7_2,
-        (long *)_vq_quantmap__44u3__p7_2,
-        17,
-        17
-};
-
 static const static_codebook _44u3__p7_2 = {
         2, 289,
         (long *)_vq_lengthlist__44u3__p7_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u3__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u3__p7_2,
-        NULL,
         0
 };
 
@@ -6048,9 +4074,6 @@
         (long *)_huff_lengthlist__44u3__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -6066,9 +4089,6 @@
         (long *)_huff_lengthlist__44u4__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -6087,29 +4107,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u4__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u4__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u4__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u4__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u4__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p1_0,
-        NULL,
         0
 };
 
@@ -6128,29 +4130,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u4__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u4__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u4__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u4__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u4__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p2_0,
-        NULL,
         0
 };
 
@@ -6205,29 +4189,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44u4__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u4__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u4__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u4__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u4__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p3_0,
-        NULL,
         0
 };
 
@@ -6282,29 +4248,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u4__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u4__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u4__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u4__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u4__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p4_0,
-        NULL,
         0
 };
 
@@ -6329,30 +4277,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u4__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u4__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u4__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u4__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p5_0,
-        NULL,
         0
 };
 
@@ -6386,31 +4315,11 @@
         16,16,16,17,17,18,17,20,21,
 };
 
-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 const long _vq_quantmap__44u4__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u4__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u4__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u4__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p6_0,
-        NULL,
         0
 };
 
@@ -6427,29 +4336,11 @@
          6, 5, 6, 6, 5, 5, 6, 6, 6,
 };
 
-static const float _vq_quantthresh__44u4__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u4__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u4__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u4__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u4__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p6_1,
-        NULL,
         0
 };
 
@@ -6483,31 +4374,11 @@
         11,11,11,11,11,11,11,11,11,
 };
 
-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 const long _vq_quantmap__44u4__p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u4__p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u4__p7_0,
         1, -514332672, 1627381760, 4, 0,
         (long *)_vq_quantlist__44u4__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p7_0,
-        NULL,
         0
 };
 
@@ -6547,31 +4418,11 @@
         16,
 };
 
-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 const long _vq_quantmap__44u4__p7_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u4__p7_1 = {
         2, 225,
         (long *)_vq_lengthlist__44u4__p7_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__44u4__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p7_1,
-        NULL,
         0
 };
 
@@ -6617,32 +4468,11 @@
         10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u4__p7_2 = {
-        (float *)_vq_quantthresh__44u4__p7_2,
-        (long *)_vq_quantmap__44u4__p7_2,
-        17,
-        17
-};
-
 static const static_codebook _44u4__p7_2 = {
         2, 289,
         (long *)_vq_lengthlist__44u4__p7_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u4__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u4__p7_2,
-        NULL,
         0
 };
 
@@ -6658,9 +4488,6 @@
         (long *)_huff_lengthlist__44u4__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -6679,9 +4506,6 @@
         (long *)_huff_lengthlist__44u5__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -6700,29 +4524,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u5__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u5__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u5__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u5__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u5__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p1_0,
-        NULL,
         0
 };
 
@@ -6741,29 +4547,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u5__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u5__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u5__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u5__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u5__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p2_0,
-        NULL,
         0
 };
 
@@ -6818,29 +4606,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44u5__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u5__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u5__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u5__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u5__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p3_0,
-        NULL,
         0
 };
 
@@ -6895,29 +4665,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u5__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u5__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u5__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u5__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u5__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p4_0,
-        NULL,
         0
 };
 
@@ -6942,30 +4694,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44u5__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u5__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u5__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u5__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p5_0,
-        NULL,
         0
 };
 
@@ -6990,30 +4723,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44u5__p6_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u5__p6_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u5__p6_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u5__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p6_0,
-        NULL,
         0
 };
 
@@ -7032,29 +4746,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u5__p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44u5__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u5__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u5__p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44u5__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p7_0,
-        NULL,
         0
 };
 
@@ -7083,31 +4779,11 @@
          9, 9, 9, 9, 9,10,10,10,10,
 };
 
-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 const long _vq_quantmap__44u5__p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u5__p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u5__p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u5__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p7_1,
-        NULL,
         0
 };
 
@@ -7136,31 +4812,11 @@
         12,13,13,14,14,14,14,15,15,
 };
 
-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 const long _vq_quantmap__44u5__p8_0[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u5__p8_0 = {
         2, 121,
         (long *)_vq_lengthlist__44u5__p8_0,
         1, -524582912, 1618345984, 4, 0,
         (long *)_vq_quantlist__44u5__p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p8_0,
-        NULL,
         0
 };
 
@@ -7189,31 +4845,11 @@
          8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44u5__p8_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u5__p8_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u5__p8_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u5__p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p8_1,
-        NULL,
         0
 };
 
@@ -7247,31 +4883,11 @@
         12,12,12,12,12,12,12,12,12,
 };
 
-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 const long _vq_quantmap__44u5__p9_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u5__p9_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u5__p9_0,
         1, -514332672, 1627381760, 4, 0,
         (long *)_vq_quantlist__44u5__p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p9_0,
-        NULL,
         0
 };
 
@@ -7311,31 +4927,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44u5__p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u5__p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__44u5__p9_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__44u5__p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p9_1,
-        NULL,
         0
 };
 
@@ -7381,32 +4977,11 @@
         10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u5__p9_2 = {
-        (float *)_vq_quantthresh__44u5__p9_2,
-        (long *)_vq_quantmap__44u5__p9_2,
-        17,
-        17
-};
-
 static const static_codebook _44u5__p9_2 = {
         2, 289,
         (long *)_vq_lengthlist__44u5__p9_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u5__p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u5__p9_2,
-        NULL,
         0
 };
 
@@ -7425,9 +5000,6 @@
         (long *)_huff_lengthlist__44u5__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -7446,9 +5018,6 @@
         (long *)_huff_lengthlist__44u6__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -7467,29 +5036,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u6__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u6__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u6__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u6__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u6__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p1_0,
-        NULL,
         0
 };
 
@@ -7508,29 +5059,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u6__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u6__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u6__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u6__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u6__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p2_0,
-        NULL,
         0
 };
 
@@ -7585,29 +5118,11 @@
         19,
 };
 
-static const float _vq_quantthresh__44u6__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u6__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u6__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u6__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u6__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p3_0,
-        NULL,
         0
 };
 
@@ -7662,29 +5177,11 @@
         13,
 };
 
-static const float _vq_quantthresh__44u6__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u6__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u6__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u6__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u6__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p4_0,
-        NULL,
         0
 };
 
@@ -7709,30 +5206,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44u6__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u6__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u6__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u6__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p5_0,
-        NULL,
         0
 };
 
@@ -7757,30 +5235,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u6__p6_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u6__p6_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u6__p6_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u6__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p6_0,
-        NULL,
         0
 };
 
@@ -7799,29 +5258,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u6__p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44u6__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u6__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u6__p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44u6__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p7_0,
-        NULL,
         0
 };
 
@@ -7850,31 +5291,11 @@
          8, 8, 8, 9, 9, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__44u6__p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u6__p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u6__p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u6__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p7_1,
-        NULL,
         0
 };
 
@@ -7903,31 +5324,11 @@
         12,13,13,14,14,14,15,15,15,
 };
 
-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 const long _vq_quantmap__44u6__p8_0[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u6__p8_0 = {
         2, 121,
         (long *)_vq_lengthlist__44u6__p8_0,
         1, -524582912, 1618345984, 4, 0,
         (long *)_vq_quantlist__44u6__p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p8_0,
-        NULL,
         0
 };
 
@@ -7956,31 +5357,11 @@
          8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44u6__p8_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u6__p8_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u6__p8_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u6__p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p8_1,
-        NULL,
         0
 };
 
@@ -8020,31 +5401,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44u6__p9_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u6__p9_0 = {
         2, 225,
         (long *)_vq_lengthlist__44u6__p9_0,
         1, -514071552, 1627381760, 4, 0,
         (long *)_vq_quantlist__44u6__p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p9_0,
-        NULL,
         0
 };
 
@@ -8084,31 +5445,11 @@
         13,
 };
 
-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 const long _vq_quantmap__44u6__p9_1[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u6__p9_1 = {
         2, 225,
         (long *)_vq_lengthlist__44u6__p9_1,
         1, -522338304, 1620115456, 4, 0,
         (long *)_vq_quantlist__44u6__p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p9_1,
-        NULL,
         0
 };
 
@@ -8154,32 +5495,11 @@
         10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u6__p9_2 = {
-        (float *)_vq_quantthresh__44u6__p9_2,
-        (long *)_vq_quantmap__44u6__p9_2,
-        17,
-        17
-};
-
 static const static_codebook _44u6__p9_2 = {
         2, 289,
         (long *)_vq_lengthlist__44u6__p9_2,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u6__p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u6__p9_2,
-        NULL,
         0
 };
 
@@ -8198,9 +5518,6 @@
         (long *)_huff_lengthlist__44u6__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -8219,9 +5536,6 @@
         (long *)_huff_lengthlist__44u7__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -8240,29 +5554,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44u7__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u7__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u7__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u7__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u7__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p1_0,
-        NULL,
         0
 };
 
@@ -8281,29 +5577,11 @@
          9,
 };
 
-static const float _vq_quantthresh__44u7__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u7__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u7__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u7__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u7__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p2_0,
-        NULL,
         0
 };
 
@@ -8358,29 +5636,11 @@
          0,
 };
 
-static const float _vq_quantthresh__44u7__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u7__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u7__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u7__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u7__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p3_0,
-        NULL,
         0
 };
 
@@ -8435,29 +5695,11 @@
         14,
 };
 
-static const float _vq_quantthresh__44u7__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u7__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u7__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u7__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u7__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p4_0,
-        NULL,
         0
 };
 
@@ -8482,30 +5724,11 @@
         14,
 };
 
-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 const long _vq_quantmap__44u7__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u7__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u7__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u7__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p5_0,
-        NULL,
         0
 };
 
@@ -8530,30 +5753,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u7__p6_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u7__p6_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u7__p6_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u7__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p6_0,
-        NULL,
         0
 };
 
@@ -8572,29 +5776,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u7__p7_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44u7__p7_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u7__p7_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u7__p7_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44u7__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p7_0,
-        NULL,
         0
 };
 
@@ -8623,31 +5809,11 @@
          8, 9, 9, 9, 9, 9,10,10,10,
 };
 
-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 const long _vq_quantmap__44u7__p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u7__p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u7__p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u7__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p7_1,
-        NULL,
         0
 };
 
@@ -8676,31 +5842,11 @@
         12,13,13,14,14,15,15,15,16,
 };
 
-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 const long _vq_quantmap__44u7__p8_0[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u7__p8_0 = {
         2, 121,
         (long *)_vq_lengthlist__44u7__p8_0,
         1, -524582912, 1618345984, 4, 0,
         (long *)_vq_quantlist__44u7__p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p8_0,
-        NULL,
         0
 };
 
@@ -8729,31 +5875,11 @@
          7, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44u7__p8_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u7__p8_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u7__p8_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u7__p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p8_1,
-        NULL,
         0
 };
 
@@ -8782,31 +5908,11 @@
          9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
-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 const long _vq_quantmap__44u7__p9_0[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u7__p9_0 = {
         2, 121,
         (long *)_vq_lengthlist__44u7__p9_0,
         1, -512171520, 1630791680, 4, 0,
         (long *)_vq_quantlist__44u7__p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p9_0,
-        NULL,
         0
 };
 
@@ -8840,31 +5946,11 @@
         15,15,15,15,17,17,16,17,16,
 };
 
-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 const long _vq_quantmap__44u7__p9_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u7__p9_1 = {
         2, 169,
         (long *)_vq_lengthlist__44u7__p9_1,
         1, -518889472, 1622704128, 4, 0,
         (long *)_vq_quantlist__44u7__p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p9_1,
-        NULL,
         0
 };
 
@@ -8927,40 +6013,11 @@
          8,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44u7__p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44u7__p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44u7__p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u7__p9_2,
-        NULL,
         0
 };
 
@@ -8979,9 +6036,6 @@
         (long *)_huff_lengthlist__44u7__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -9000,9 +6054,6 @@
         (long *)_huff_lengthlist__44u8__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -9021,9 +6072,6 @@
         (long *)_huff_lengthlist__44u8__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -9042,29 +6090,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u8_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u8_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u8_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u8_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u8_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p1_0,
-        NULL,
         0
 };
 
@@ -9119,29 +6149,11 @@
         14,
 };
 
-static const float _vq_quantthresh__44u8_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u8_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u8_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u8_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u8_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p2_0,
-        NULL,
         0
 };
 
@@ -9166,30 +6178,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44u8_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u8_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u8_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u8_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p3_0,
-        NULL,
         0
 };
 
@@ -9235,32 +6228,11 @@
         14,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u8_p4_0 = {
-        (float *)_vq_quantthresh__44u8_p4_0,
-        (long *)_vq_quantmap__44u8_p4_0,
-        17,
-        17
-};
-
 static const static_codebook _44u8_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__44u8_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u8_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p4_0,
-        NULL,
         0
 };
 
@@ -9279,29 +6251,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u8_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44u8_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u8_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u8_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44u8_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p5_0,
-        NULL,
         0
 };
 
@@ -9330,31 +6284,11 @@
          8, 8, 8, 8, 8, 8, 8, 9, 9,
 };
 
-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 const long _vq_quantmap__44u8_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u8_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u8_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u8_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p5_1,
-        NULL,
         0
 };
 
@@ -9388,31 +6322,11 @@
         11,11,11,11,11,12,11,12,12,
 };
 
-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 const long _vq_quantmap__44u8_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u8_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u8_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u8_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p6_0,
-        NULL,
         0
 };
 
@@ -9429,29 +6343,11 @@
          5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static const float _vq_quantthresh__44u8_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u8_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u8_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u8_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u8_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p6_1,
-        NULL,
         0
 };
 
@@ -9485,31 +6381,11 @@
         13,13,14,14,14,15,15,15,16,
 };
 
-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 const long _vq_quantmap__44u8_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u8_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u8_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__44u8_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p7_0,
-        NULL,
         0
 };
 
@@ -9538,31 +6414,11 @@
          7, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44u8_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u8_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u8_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u8_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p7_1,
-        NULL,
         0
 };
 
@@ -9602,31 +6458,11 @@
         17,
 };
 
-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 const long _vq_quantmap__44u8_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u8_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__44u8_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44u8_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p8_0,
-        NULL,
         0
 };
 
@@ -9685,33 +6521,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u8_p8_1 = {
-        (float *)_vq_quantthresh__44u8_p8_1,
-        (long *)_vq_quantmap__44u8_p8_1,
-        21,
-        21
-};
-
 static const static_codebook _44u8_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__44u8_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u8_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p8_1,
-        NULL,
         0
 };
 
@@ -9736,30 +6550,11 @@
          8,
 };
 
-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 const long _vq_quantmap__44u8_p9_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u8_p9_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u8_p9_0,
         1, -511895552, 1631393792, 4, 0,
         (long *)_vq_quantlist__44u8_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p9_0,
-        NULL,
         0
 };
 
@@ -9811,33 +6606,11 @@
         16,15,16,16,16,16,16,16,16,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u8_p9_1 = {
-        (float *)_vq_quantthresh__44u8_p9_1,
-        (long *)_vq_quantmap__44u8_p9_1,
-        19,
-        19
-};
-
 static const static_codebook _44u8_p9_1 = {
         2, 361,
         (long *)_vq_lengthlist__44u8_p9_1,
         1, -518287360, 1622704128, 5, 0,
         (long *)_vq_quantlist__44u8_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p9_1,
-        NULL,
         0
 };
 
@@ -9900,40 +6673,11 @@
          7,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44u8_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44u8_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44u8_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u8_p9_2,
-        NULL,
         0
 };
 
@@ -9952,9 +6696,6 @@
         (long *)_huff_lengthlist__44u9__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -9973,9 +6714,6 @@
         (long *)_huff_lengthlist__44u9__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -9994,29 +6732,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u9_p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44u9_p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u9_p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u9_p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44u9_p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p1_0,
-        NULL,
         0
 };
 
@@ -10071,29 +6791,11 @@
         14,
 };
 
-static const float _vq_quantthresh__44u9_p2_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u9_p2_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u9_p2_0 = {
         4, 625,
         (long *)_vq_lengthlist__44u9_p2_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u9_p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p2_0,
-        NULL,
         0
 };
 
@@ -10118,30 +6820,11 @@
         11,
 };
 
-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 const long _vq_quantmap__44u9_p3_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44u9_p3_0 = {
         2, 81,
         (long *)_vq_lengthlist__44u9_p3_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u9_p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p3_0,
-        NULL,
         0
 };
 
@@ -10187,32 +6870,11 @@
         14,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u9_p4_0 = {
-        (float *)_vq_quantthresh__44u9_p4_0,
-        (long *)_vq_quantmap__44u9_p4_0,
-        17,
-        17
-};
-
 static const static_codebook _44u9_p4_0 = {
         2, 289,
         (long *)_vq_lengthlist__44u9_p4_0,
         1, -529530880, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u9_p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p4_0,
-        NULL,
         0
 };
 
@@ -10231,29 +6893,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44u9_p5_0[] = {
-        -5.5, 5.5, 
-};
-
-static const long _vq_quantmap__44u9_p5_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44u9_p5_0 = {
         4, 81,
         (long *)_vq_lengthlist__44u9_p5_0,
         1, -529137664, 1618345984, 2, 0,
         (long *)_vq_quantlist__44u9_p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p5_0,
-        NULL,
         0
 };
 
@@ -10282,31 +6926,11 @@
          8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44u9_p5_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u9_p5_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u9_p5_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u9_p5_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p5_1,
-        NULL,
         0
 };
 
@@ -10340,31 +6964,11 @@
         10,11,11,11,11,12,11,12,12,
 };
 
-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 const long _vq_quantmap__44u9_p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u9_p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u9_p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44u9_p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p6_0,
-        NULL,
         0
 };
 
@@ -10381,29 +6985,11 @@
          5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static const float _vq_quantthresh__44u9_p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44u9_p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44u9_p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44u9_p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44u9_p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p6_1,
-        NULL,
         0
 };
 
@@ -10437,31 +7023,11 @@
         12,13,13,14,14,14,15,15,15,
 };
 
-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 const long _vq_quantmap__44u9_p7_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44u9_p7_0 = {
         2, 169,
         (long *)_vq_lengthlist__44u9_p7_0,
         1, -523206656, 1618345984, 4, 0,
         (long *)_vq_quantlist__44u9_p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p7_0,
-        NULL,
         0
 };
 
@@ -10490,31 +7056,11 @@
          7, 7, 7, 7, 7, 8, 8, 8, 8,
 };
 
-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 const long _vq_quantmap__44u9_p7_1[] = {
-            9,    7,    5,    3,    1,    0,    2,    4,
-            6,    8,   10,
-};
-
-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 const static_codebook _44u9_p7_1 = {
         2, 121,
         (long *)_vq_lengthlist__44u9_p7_1,
         1, -531365888, 1611661312, 4, 0,
         (long *)_vq_quantlist__44u9_p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p7_1,
-        NULL,
         0
 };
 
@@ -10554,31 +7100,11 @@
         15,
 };
 
-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 const long _vq_quantmap__44u9_p8_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u9_p8_0 = {
         2, 225,
         (long *)_vq_lengthlist__44u9_p8_0,
         1, -520986624, 1620377600, 4, 0,
         (long *)_vq_quantlist__44u9_p8_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p8_0,
-        NULL,
         0
 };
 
@@ -10637,33 +7163,11 @@
         10,10,10,10,10,10,10,10,10,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u9_p8_1 = {
-        (float *)_vq_quantthresh__44u9_p8_1,
-        (long *)_vq_quantmap__44u9_p8_1,
-        21,
-        21
-};
-
 static const static_codebook _44u9_p8_1 = {
         2, 441,
         (long *)_vq_lengthlist__44u9_p8_1,
         1, -529268736, 1611661312, 5, 0,
         (long *)_vq_quantlist__44u9_p8_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p8_1,
-        NULL,
         0
 };
 
@@ -10703,31 +7207,11 @@
         10,
 };
 
-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 const long _vq_quantmap__44u9_p9_0[] = {
-           13,   11,    9,    7,    5,    3,    1,    0,
-            2,    4,    6,    8,   10,   12,   14,
-};
-
-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 const static_codebook _44u9_p9_0 = {
         2, 225,
         (long *)_vq_lengthlist__44u9_p9_0,
         1, -510036736, 1631393792, 4, 0,
         (long *)_vq_quantlist__44u9_p9_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p9_0,
-        NULL,
         0
 };
 
@@ -10779,33 +7263,11 @@
         17,17,15,17,15,17,16,16,17,
 };
 
-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 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 const encode_aux_threshmatch _vq_auxt__44u9_p9_1 = {
-        (float *)_vq_quantthresh__44u9_p9_1,
-        (long *)_vq_quantmap__44u9_p9_1,
-        19,
-        19
-};
-
 static const static_codebook _44u9_p9_1 = {
         2, 361,
         (long *)_vq_lengthlist__44u9_p9_1,
         1, -518287360, 1622704128, 5, 0,
         (long *)_vq_quantlist__44u9_p9_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p9_1,
-        NULL,
         0
 };
 
@@ -10868,40 +7330,11 @@
          7,
 };
 
-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, 
-        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, 13.5, 14.5, 15.5, 
-        16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-};
-
-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,
-            0,    2,    4,    6,    8,   10,   12,   14,
-           16,   18,   20,   22,   24,   26,   28,   30,
-           32,   34,   36,   38,   40,   42,   44,   46,
-           48,
-};
-
-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 const static_codebook _44u9_p9_2 = {
         1, 49,
         (long *)_vq_lengthlist__44u9_p9_2,
         1, -526909440, 1611661312, 6, 0,
         (long *)_vq_quantlist__44u9_p9_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44u9_p9_2,
-        NULL,
         0
 };
 
@@ -10917,9 +7350,6 @@
         (long *)_huff_lengthlist__44un1__long,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 
@@ -10938,29 +7368,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44un1__p1_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44un1__p1_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44un1__p1_0 = {
         4, 81,
         (long *)_vq_lengthlist__44un1__p1_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44un1__p1_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p1_0,
-        NULL,
         0
 };
 
@@ -10979,29 +7391,11 @@
          8,
 };
 
-static const float _vq_quantthresh__44un1__p2_0[] = {
-        -0.5, 0.5, 
-};
-
-static const long _vq_quantmap__44un1__p2_0[] = {
-            1,    0,    2,
-};
-
-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 const static_codebook _44un1__p2_0 = {
         4, 81,
         (long *)_vq_lengthlist__44un1__p2_0,
         1, -535822336, 1611661312, 2, 0,
         (long *)_vq_quantlist__44un1__p2_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p2_0,
-        NULL,
         0
 };
 
@@ -11056,29 +7450,11 @@
         17,
 };
 
-static const float _vq_quantthresh__44un1__p3_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44un1__p3_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44un1__p3_0 = {
         4, 625,
         (long *)_vq_lengthlist__44un1__p3_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44un1__p3_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p3_0,
-        NULL,
         0
 };
 
@@ -11133,29 +7509,11 @@
         12,
 };
 
-static const float _vq_quantthresh__44un1__p4_0[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44un1__p4_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44un1__p4_0 = {
         4, 625,
         (long *)_vq_lengthlist__44un1__p4_0,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44un1__p4_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p4_0,
-        NULL,
         0
 };
 
@@ -11180,30 +7538,11 @@
         12,
 };
 
-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 const long _vq_quantmap__44un1__p5_0[] = {
-            7,    5,    3,    1,    0,    2,    4,    6,
-            8,
-};
-
-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 const static_codebook _44un1__p5_0 = {
         2, 81,
         (long *)_vq_lengthlist__44un1__p5_0,
         1, -531628032, 1611661312, 4, 0,
         (long *)_vq_quantlist__44un1__p5_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p5_0,
-        NULL,
         0
 };
 
@@ -11237,31 +7576,11 @@
         16, 0,15,18,18, 0,16, 0, 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 const long _vq_quantmap__44un1__p6_0[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44un1__p6_0 = {
         2, 169,
         (long *)_vq_lengthlist__44un1__p6_0,
         1, -526516224, 1616117760, 4, 0,
         (long *)_vq_quantlist__44un1__p6_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p6_0,
-        NULL,
         0
 };
 
@@ -11278,29 +7597,11 @@
          6, 5, 6, 6, 5, 6, 6, 6, 6,
 };
 
-static const float _vq_quantthresh__44un1__p6_1[] = {
-        -1.5, -0.5, 0.5, 1.5, 
-};
-
-static const long _vq_quantmap__44un1__p6_1[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44un1__p6_1 = {
         2, 25,
         (long *)_vq_lengthlist__44un1__p6_1,
         1, -533725184, 1611661312, 3, 0,
         (long *)_vq_quantlist__44un1__p6_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p6_1,
-        NULL,
         0
 };
 
@@ -11355,29 +7656,11 @@
         10,
 };
 
-static const float _vq_quantthresh__44un1__p7_0[] = {
-        -253.5, -84.5, 84.5, 253.5, 
-};
-
-static const long _vq_quantmap__44un1__p7_0[] = {
-            3,    1,    0,    2,    4,
-};
-
-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 const static_codebook _44un1__p7_0 = {
         4, 625,
         (long *)_vq_lengthlist__44un1__p7_0,
         1, -518709248, 1626677248, 3, 0,
         (long *)_vq_quantlist__44un1__p7_0,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p7_0,
-        NULL,
         0
 };
 
@@ -11411,31 +7694,11 @@
         12,13,13,12,13,13,14,14,14,
 };
 
-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 const long _vq_quantmap__44un1__p7_1[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44un1__p7_1 = {
         2, 169,
         (long *)_vq_lengthlist__44un1__p7_1,
         1, -523010048, 1618608128, 4, 0,
         (long *)_vq_quantlist__44un1__p7_1,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p7_1,
-        NULL,
         0
 };
 
@@ -11469,31 +7732,11 @@
          9, 9, 9,10,10,10,10,10,10,
 };
 
-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 const long _vq_quantmap__44un1__p7_2[] = {
-           11,    9,    7,    5,    3,    1,    0,    2,
-            4,    6,    8,   10,   12,
-};
-
-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 const static_codebook _44un1__p7_2 = {
         2, 169,
         (long *)_vq_lengthlist__44un1__p7_2,
         1, -531103744, 1611661312, 4, 0,
         (long *)_vq_quantlist__44un1__p7_2,
-        NULL,
-        (encode_aux_threshmatch *)&_vq_auxt__44un1__p7_2,
-        NULL,
         0
 };
 
@@ -11509,9 +7752,6 @@
         (long *)_huff_lengthlist__44un1__short,
         0, 0, 0, 0, 0,
         NULL,
-        NULL,
-        NULL,
-        NULL,
         0
 };
 

Modified: trunk/vorbis/lib/codebook.c
===================================================================
--- trunk/vorbis/lib/codebook.c	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/codebook.c	2010-03-01 08:38:14 UTC (rev 16939)
@@ -264,37 +264,6 @@
   return(book->c->lengthlist[a]);
 }
 
-/* One the encode side, our vector writers are each designed for a
-specific purpose, and the encoder is not flexible without modification:
-
-The LSP vector coder uses a single stage nearest-match with no
-interleave, so no step and no error return.  This is specced by floor0
-and doesn't change.
-
-Residue0 encoding interleaves, uses multiple stages, and each stage
-peels of a specific amount of resolution from a lattice (thus we want
-to match by threshold, not nearest match).  Residue doesn't *have* to
-be encoded that way, but to change it, one will need to add more
-infrastructure on the encode side (decode side is specced and simpler) */
-
-/* floor0 LSP (single stage, non interleaved, nearest match) */
-/* returns entry number and *modifies a* to the quantization value *****/
-int vorbis_book_errorv(codebook *book,float *a){
-  int dim=book->dim,k;
-  int best=_best(book,a,1);
-  for(k=0;k<dim;k++)
-    a[k]=(book->valuelist+best*dim)[k];
-  return(best);
-}
-
-/* returns the number of bits and *modifies a* to the quantization value *****/
-int vorbis_book_encodev(codebook *book,int best,float *a,oggpack_buffer *b){
-  int k,dim=book->dim;
-  for(k=0;k<dim;k++)
-    a[k]=(book->valuelist+best*dim)[k];
-  return(vorbis_book_encode(book,best,b));
-}
-
 /* the 'eliminate the decode tree' optimization actually requires the
    codewords to be MSb first, not LSb.  This is an annoying inelegancy
    (and one of the first places where carefully thought out design
@@ -495,144 +464,3 @@
   }
   return(0);
 }
-
-#ifdef _V_SELFTEST
-/* Simple enough; pack a few candidate codebooks, unpack them.  Code a
-   number of vectors through (keeping track of the quantized values),
-   and decode using the unpacked book.  quantized version of in should
-   exactly equal out */
-
-#include <stdio.h>
-
-#include "vorbis/book/lsp20_0.vqh"
-#include "vorbis/book/res0a_13.vqh"
-#define TESTSIZE 40
-
-float test1[TESTSIZE]={
-  0.105939f,
-  0.215373f,
-  0.429117f,
-  0.587974f,
-
-  0.181173f,
-  0.296583f,
-  0.515707f,
-  0.715261f,
-
-  0.162327f,
-  0.263834f,
-  0.342876f,
-  0.406025f,
-
-  0.103571f,
-  0.223561f,
-  0.368513f,
-  0.540313f,
-
-  0.136672f,
-  0.395882f,
-  0.587183f,
-  0.652476f,
-
-  0.114338f,
-  0.417300f,
-  0.525486f,
-  0.698679f,
-
-  0.147492f,
-  0.324481f,
-  0.643089f,
-  0.757582f,
-
-  0.139556f,
-  0.215795f,
-  0.324559f,
-  0.399387f,
-
-  0.120236f,
-  0.267420f,
-  0.446940f,
-  0.608760f,
-
-  0.115587f,
-  0.287234f,
-  0.571081f,
-  0.708603f,
-};
-
-float test3[TESTSIZE]={
-  0,1,-2,3,4,-5,6,7,8,9,
-  8,-2,7,-1,4,6,8,3,1,-9,
-  10,11,12,13,14,15,26,17,18,19,
-  30,-25,-30,-1,-5,-32,4,3,-2,0};
-
-static_codebook *testlist[]={&_vq_book_lsp20_0,
-                             &_vq_book_res0a_13,NULL};
-float   *testvec[]={test1,test3};
-
-int main(){
-  oggpack_buffer write;
-  oggpack_buffer read;
-  long ptr=0,i;
-  oggpack_writeinit(&write);
-
-  fprintf(stderr,"Testing codebook abstraction...:\n");
-
-  while(testlist[ptr]){
-    codebook c;
-    static_codebook s;
-    float *qv=alloca(sizeof(*qv)*TESTSIZE);
-    float *iv=alloca(sizeof(*iv)*TESTSIZE);
-    memcpy(qv,testvec[ptr],sizeof(*qv)*TESTSIZE);
-    memset(iv,0,sizeof(*iv)*TESTSIZE);
-
-    fprintf(stderr,"\tpacking/coding %ld... ",ptr);
-
-    /* pack the codebook, write the testvector */
-    oggpack_reset(&write);
-    vorbis_book_init_encode(&c,testlist[ptr]); /* get it into memory
-                                                  we can write */
-    vorbis_staticbook_pack(testlist[ptr],&write);
-    fprintf(stderr,"Codebook size %ld bytes... ",oggpack_bytes(&write));
-    for(i=0;i<TESTSIZE;i+=c.dim){
-      int best=_best(&c,qv+i,1);
-      vorbis_book_encodev(&c,best,qv+i,&write);
-    }
-    vorbis_book_clear(&c);
-
-    fprintf(stderr,"OK.\n");
-    fprintf(stderr,"\tunpacking/decoding %ld... ",ptr);
-
-    /* transfer the write data to a read buffer and unpack/read */
-    oggpack_readinit(&read,oggpack_get_buffer(&write),oggpack_bytes(&write));
-    if(vorbis_staticbook_unpack(&read,&s)){
-      fprintf(stderr,"Error unpacking codebook.\n");
-      exit(1);
-    }
-    if(vorbis_book_init_decode(&c,&s)){
-      fprintf(stderr,"Error initializing codebook.\n");
-      exit(1);
-    }
-
-    for(i=0;i<TESTSIZE;i+=c.dim)
-      if(vorbis_book_decodev_set(&c,iv+i,&read,c.dim)==-1){
-        fprintf(stderr,"Error reading codebook test data (EOP).\n");
-        exit(1);
-      }
-    for(i=0;i<TESTSIZE;i++)
-      if(fabs(qv[i]-iv[i])>.000001){
-        fprintf(stderr,"read (%g) != written (%g) at position (%ld)\n",
-                iv[i],qv[i],i);
-        exit(1);
-      }
-
-    fprintf(stderr,"OK\n");
-    ptr++;
-  }
-
-  /* The above is the trivial stuff; now try unquantizing a log scale codebook */
-
-  exit(0);
-}
-
-#endif

Modified: trunk/vorbis/lib/codebook.h
===================================================================
--- trunk/vorbis/lib/codebook.h	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/codebook.h	2010-03-01 08:38:14 UTC (rev 16939)
@@ -52,50 +52,9 @@
   long     *quantlist;  /* map == 1: (int)(entries^(1/dim)) element column map
                            map == 2: list of dim*entries quantized entry vals
                         */
-
-  /* encode helpers ********************************************************/
-  struct encode_aux_nearestmatch *nearest_tree;
-  struct encode_aux_threshmatch  *thresh_tree;
-  struct encode_aux_pigeonhole  *pigeon_tree;
-
   int allocedp;
 } static_codebook;
 
-/* this structures an arbitrary trained book to quickly find the
-   nearest cell match */
-typedef struct encode_aux_nearestmatch{
-  /* pre-calculated partitioning tree */
-  long   *ptr0;
-  long   *ptr1;
-
-  long   *p;         /* decision points (each is an entry) */
-  long   *q;         /* decision points (each is an entry) */
-  long   aux;        /* number of tree entries */
-  long   alloc;
-} encode_aux_nearestmatch;
-
-/* assumes a maptype of 1; encode side only, so that's OK */
-typedef struct encode_aux_threshmatch{
-  float *quantthresh;
-  long   *quantmap;
-  int     quantvals;
-  int     threshvals;
-} encode_aux_threshmatch;
-
-typedef struct encode_aux_pigeonhole{
-  float min;
-  float del;
-
-  int  mapentries;
-  int  quantvals;
-  long *pigeonmap;
-
-  long fittotal;
-  long *fitlist;
-  long *fitmap;
-  long *fitlength;
-} encode_aux_pigeonhole;
-
 typedef struct codebook{
   long dim;           /* codebook dimensions (elements per vector) */
   long entries;       /* codebook entries */
@@ -114,6 +73,10 @@
   int           dec_firsttablen;
   int           dec_maxlength;
 
+  /* The current encoder uses only centered, integer-only lattice books. */
+  int           quantvals;
+  int           minval;
+  int           delta;
 } codebook;
 
 extern void vorbis_staticbook_clear(static_codebook *b);
@@ -140,9 +103,6 @@
 extern int vorbis_staticbook_unpack(oggpack_buffer *b,static_codebook *c);
 
 extern int vorbis_book_encode(codebook *book, int a, oggpack_buffer *b);
-extern int vorbis_book_errorv(codebook *book, float *a);
-extern int vorbis_book_encodev(codebook *book, int best,float *a,
-                               oggpack_buffer *b);
 
 extern long vorbis_book_decode(codebook *book, oggpack_buffer *b);
 extern long vorbis_book_decodevs_add(codebook *book, float *a,

Modified: trunk/vorbis/lib/mapping0.c
===================================================================
--- trunk/vorbis/lib/mapping0.c	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/mapping0.c	2010-03-01 08:38:14 UTC (rev 16939)
@@ -246,7 +246,7 @@
 
   int    *nonzero    = alloca(sizeof(*nonzero)*vi->channels);
   float  **gmdct     = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct));
-  int    **ilogmaskch= _vorbis_block_alloc(vb,vi->channels*sizeof(*ilogmaskch));
+  int    **iwork      = _vorbis_block_alloc(vb,vi->channels*sizeof(*iwork));
   int ***floor_posts = _vorbis_block_alloc(vb,vi->channels*sizeof(*floor_posts));
 
   float global_ampmax=vbi->ampmax;
@@ -628,6 +628,7 @@
       for(i=0;i<vi->channels;i++){
         float *mdct    =gmdct[i];
         sortindex[i]=alloca(sizeof(**sortindex)*n/2);
+        iwork[i]=_vorbis_block_alloc(vb,n/2*sizeof(**iwork));
         _vp_noise_normalize_sort(psy_look,mdct,sortindex[i]);
       }
     }
@@ -653,8 +654,7 @@
         int submap=info->chmuxlist[i];
         float *mdct    =gmdct[i];
         float *res     =vb->pcm[i];
-        int   *ilogmask=ilogmaskch[i]=
-          _vorbis_block_alloc(vb,n/2*sizeof(**gmdct));
+        int   *ilogmask=iwork[i];
 
         nonzero[i]=floor1_encode(opb,vb,b->flr[info->floorsubmap[submap]],
                                  floor_posts[i][k],
@@ -665,7 +665,7 @@
           sprintf(buf,"maskI%c%d",i?'R':'L',k);
           float work[n/2];
           for(j=0;j<n/2;j++)
-            work[j]=FLOOR1_fromdB_LOOKUP[ilogmask[j]];
+            work[j]=FLOOR1_fromdB_LOOKUP[iwork[j]];
           _analysis_output(buf,seq,work,n/2,1,1,0);
         }
 #endif
@@ -683,7 +683,7 @@
           char buf[80];
           float work[n/2];
           for(j=0;j<n/2;j++)
-            work[j]=FLOOR1_fromdB_LOOKUP[ilogmask[j]]*(res+n/2)[j];
+            work[j]=FLOOR1_fromdB_LOOKUP[iwork[j]]*(res+n/2)[j];
           sprintf(buf,"resI%c%d",i?'R':'L',k);
           _analysis_output(buf,seq,work,n/2,1,1,0);
 
@@ -705,7 +705,7 @@
                    vb->pcm,
                    mag_memo,
                    mag_sort,
-                   ilogmaskch,
+                   iwork,
                    nonzero,
                    ci->psy_g_param.sliding_lowpass[vb->W][k]);
       }
@@ -728,17 +728,20 @@
         classifications=_residue_P[ci->residue_type[resnum]]->
           class(vb,b->residue[resnum],couple_bundle,zerobundle,ch_in_bundle);
 
-        /* couple_bundle is destructively overwritten by
-           the class function if some but not all of the channels are
-           marked as silence; build a fresh copy */
         ch_in_bundle=0;
         for(j=0;j<vi->channels;j++)
-          if(info->chmuxlist[j]==i)
-            couple_bundle[ch_in_bundle++]=vb->pcm[j]+n/2;
+          if(info->chmuxlist[j]==i){
+            /* move from float to int vector; temporary until new coupling lands */
+            float *res=vb->pcm[j]+n/2;
+            int *ires=iwork[ch_in_bundle++];
+            int k;
+            for(k=0;k<n/2;k++)
+              ires[k]=(int)rint(res[k]);
+          }
 
         _residue_P[ci->residue_type[resnum]]->
           forward(opb,vb,b->residue[resnum],
-                  couple_bundle,NULL,zerobundle,ch_in_bundle,classifications);
+                  iwork,zerobundle,ch_in_bundle,classifications);
       }
 
       /* ok, done encoding.  Next protopacket. */

Modified: trunk/vorbis/lib/res0.c
===================================================================
--- trunk/vorbis/lib/res0.c	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/res0.c	2010-03-01 08:38:14 UTC (rev 16939)
@@ -321,65 +321,71 @@
 }
 
 /* break an abstraction and copy some code for performance purposes */
-static int local_book_besterror(codebook *book,float *a){
-  int dim=book->dim,i,k,o;
-  int best=0;
-  encode_aux_threshmatch *tt=book->c->thresh_tree;
+static int local_book_besterror(codebook *book,int *a){
+  int dim=book->dim;
+  int i,j,o;
+  int minval=book->minval;
+  int del=book->delta;
+  int qv=book->quantvals;
+  int ze=(qv>>1);
+  int index=0;
+  /* assumes integer/centered encoder codebook maptype 1 no more than dim 8 */
+  int p[8]={0,0,0,0,0,0,0,0};
 
-  /* find the quant val of each scalar */
-  for(k=0,o=dim;k<dim;++k){
-    float val=a[--o];
-    i=tt->threshvals>>1;
-
-    if(val<tt->quantthresh[i]){
-      if(val<tt->quantthresh[i-1]){
-        for(--i;i>0;--i)
-          if(val>=tt->quantthresh[i-1])
-            break;
-      }
-    }else{
-
-      for(++i;i<tt->threshvals-1;++i)
-        if(val<tt->quantthresh[i])break;
-
+  if(del!=1){
+    for(i=0,o=dim;i<dim;i++){
+      int v = (a[--o]-minval+(del>>1))/del;
+      int m = (v<ze ? ((ze-v)<<1)-1 : ((v-ze)<<1));
+      index = index*qv+ (m<0?0:(m>=qv?qv-1:m));
+      p[o]=v*del+minval;
     }
-
-    best=(best*tt->quantvals)+tt->quantmap[i];
+  }else{
+    for(i=0,o=dim;i<dim;i++){
+      int v = a[--o]-minval;
+      int m = (v<ze ? ((ze-v)<<1)-1 : ((v-ze)<<1));
+      index = index*qv+ (m<0?0:(m>=qv?qv-1:m));
+      p[o]=v*del+minval;
+    }
   }
-  /* regular lattices are easy :-) */
 
-  if(book->c->lengthlist[best]<=0){
+  if(book->c->lengthlist[index]<=0){
     const static_codebook *c=book->c;
-    int i,j;
-    float bestf=0.f;
-    float *e=book->valuelist;
-    best=-1;
+    int best=-1;
+    /* assumes integer/centered encoder codebook maptype 1 no more than dim 8 */
+    int e[8]={0,0,0,0,0,0,0,0};
+    int maxval = book->minval + book->delta*(book->quantvals-1);
     for(i=0;i<book->entries;i++){
       if(c->lengthlist[i]>0){
-        float this=0.f;
+        int this=0;
         for(j=0;j<dim;j++){
           float val=(e[j]-a[j]);
           this+=val*val;
         }
-        if(best==-1 || this<bestf){
-          bestf=this;
-          best=i;
+        if(best==-1 || this<best){
+          memcpy(p,e,sizeof(p));
+          best=this;
+          index=i;
         }
       }
-      e+=dim;
+      /* assumes the value patterning created by the tools in vq/ */
+      j=0;
+      while(e[j]>=maxval)
+        e[j++]=0;
+      if(e[j]>=0)
+        e[j]+=book->delta;
+      e[j]= -e[j];
     }
   }
 
-  if(best>-1){
-    float *ptr=book->valuelist+best*dim;
+  if(index>-1){
     for(i=0;i<dim;i++)
-      *a++ -= *ptr++;
+      *a++ -= p[i];
   }
 
-  return(best);
+  return(index);
 }
 
-static int _encodepart(oggpack_buffer *opb,float *vec, int n,
+static int _encodepart(oggpack_buffer *opb,int *vec, int n,
                        codebook *book,long *acc){
   int i,bits=0;
   int dim=book->dim;
@@ -524,9 +530,9 @@
 
 static int _01forward(oggpack_buffer *opb,
                       vorbis_block *vb,vorbis_look_residue *vl,
-                      float **in,int ch,
+                      int **in,int ch,
                       long **partword,
-                      int (*encode)(oggpack_buffer *,float *,int,
+                      int (*encode)(oggpack_buffer *,int *,int,
                                     codebook *,long *)){
   long i,j,k,s;
   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
@@ -698,54 +704,6 @@
   return(0);
 }
 
-#if 0
-/* residue 0 and 1 are just slight variants of one another. 0 is
-   interleaved, 1 is not */
-long **res0_class(vorbis_block *vb,vorbis_look_residue *vl,
-                  float **in,int *nonzero,int ch){
-  /* we encode only the nonzero parts of a bundle */
-  int i,used=0;
-  for(i=0;i<ch;i++)
-    if(nonzero[i])
-      in[used++]=in[i];
-  if(used)
-    /*return(_01class(vb,vl,in,used,_interleaved_testhack));*/
-    return(_01class(vb,vl,in,used));
-  else
-    return(0);
-}
-
-int res0_forward(vorbis_block *vb,vorbis_look_residue *vl,
-                 float **in,float **out,int *nonzero,int ch,
-                 long **partword){
-  /* we encode only the nonzero parts of a bundle */
-  int i,j,used=0,n=vb->pcmend/2;
-  for(i=0;i<ch;i++)
-    if(nonzero[i]){
-      if(out)
-        for(j=0;j<n;j++)
-          out[i][j]+=in[i][j];
-      in[used++]=in[i];
-    }
-  if(used){
-    int ret=_01forward(vb,vl,in,used,partword,
-                      _interleaved_encodepart);
-    if(out){
-      used=0;
-      for(i=0;i<ch;i++)
-        if(nonzero[i]){
-          for(j=0;j<n;j++)
-            out[i][j]-=in[used][j];
-          used++;
-        }
-    }
-    return(ret);
-  }else{
-    return(0);
-  }
-}
-#endif
-
 int res0_inverse(vorbis_block *vb,vorbis_look_residue *vl,
                  float **in,int *nonzero,int ch){
   int i,used=0;
@@ -759,29 +717,14 @@
 }
 
 int res1_forward(oggpack_buffer *opb,vorbis_block *vb,vorbis_look_residue *vl,
-                 float **in,float **out,int *nonzero,int ch,
-                 long **partword){
+                 int **in,int *nonzero,int ch, long **partword){
   int i,j,used=0,n=vb->pcmend/2;
   for(i=0;i<ch;i++)
-    if(nonzero[i]){
-      if(out)
-        for(j=0;j<n;j++)
-          out[i][j]+=in[i][j];
+    if(nonzero[i])
       in[used++]=in[i];
-    }
 
   if(used){
-    int ret=_01forward(opb,vb,vl,in,used,partword,_encodepart);
-    if(out){
-      used=0;
-      for(i=0;i<ch;i++)
-        if(nonzero[i]){
-          for(j=0;j<n;j++)
-            out[i][j]-=in[used][j];
-          used++;
-        }
-    }
-    return(ret);
+    return _01forward(opb,vb,vl,in,used,partword,_encodepart);
   }else{
     return(0);
   }
@@ -827,34 +770,22 @@
 
 int res2_forward(oggpack_buffer *opb,
                  vorbis_block *vb,vorbis_look_residue *vl,
-                 float **in,float **out,int *nonzero,int ch,
-                 long **partword){
+                 int **in,int *nonzero,int ch, long **partword){
   long i,j,k,n=vb->pcmend/2,used=0;
 
   /* don't duplicate the code; use a working vector hack for now and
      reshape ourselves into a single channel res1 */
   /* ugly; reallocs for each coupling pass :-( */
-  float *work=_vorbis_block_alloc(vb,ch*n*sizeof(*work));
+  int *work=_vorbis_block_alloc(vb,ch*n*sizeof(*work));
   for(i=0;i<ch;i++){
-    float *pcm=in[i];
+    int *pcm=in[i];
     if(nonzero[i])used++;
     for(j=0,k=i;j<n;j++,k+=ch)
       work[k]=pcm[j];
   }
 
   if(used){
-    int ret=_01forward(opb,vb,vl,&work,1,partword,_encodepart);
-    /* update the sofar vector */
-    if(out){
-      for(i=0;i<ch;i++){
-        float *pcm=in[i];
-        float *sofar=out[i];
-        for(j=0,k=i;j<n;j++,k+=ch)
-          sofar[j]+=pcm[j]-work[k];
-
-      }
-    }
-    return(ret);
+    return _01forward(opb,vb,vl,&work,1,partword,_encodepart);
   }else{
     return(0);
   }

Modified: trunk/vorbis/lib/sharedbook.c
===================================================================
--- trunk/vorbis/lib/sharedbook.c	2010-02-28 22:48:01 UTC (rev 16938)
+++ trunk/vorbis/lib/sharedbook.c	2010-03-01 08:38:14 UTC (rev 16939)
@@ -262,21 +262,6 @@
   if(b->allocedp){
     if(b->quantlist)_ogg_free(b->quantlist);
     if(b->lengthlist)_ogg_free(b->lengthlist);
-    if(b->nearest_tree){
-      _ogg_free(b->nearest_tree->ptr0);
-      _ogg_free(b->nearest_tree->ptr1);
-      _ogg_free(b->nearest_tree->p);
-      _ogg_free(b->nearest_tree->q);
-      memset(b->nearest_tree,0,sizeof(*b->nearest_tree));
-      _ogg_free(b->nearest_tree);
-    }
-    if(b->thresh_tree){
-      _ogg_free(b->thresh_tree->quantthresh);
-      _ogg_free(b->thresh_tree->quantmap);
-      memset(b->thresh_tree,0,sizeof(*b->thresh_tree));
-      _ogg_free(b->thresh_tree);
-    }
-
     memset(b,0,sizeof(*b));
   }
 }
@@ -309,7 +294,10 @@
   c->used_entries=s->entries;
   c->dim=s->dim;
   c->codelist=_make_words(s->lengthlist,s->entries,0);
-  c->valuelist=_book_unquantize(s,s->entries,NULL);
+  //c->valuelist=_book_unquantize(s,s->entries,NULL);
+  c->quantvals=_book_maptype1_quantvals(s);
+  c->minval=(int)rint(_float32_unpack(s->q_min));
+  c->delta=(int)rint(_float32_unpack(s->q_delta));
 
   return(0);
 }
@@ -445,157 +433,6 @@
   return(-1);
 }
 
-static float _dist(int el,float *ref, float *b,int step){
-  int i;
-  float acc=0.f;
-  for(i=0;i<el;i++){
-    float val=(ref[i]-b[i*step]);
-    acc+=val*val;
-  }
-  return(acc);
-}
-
-int _best(codebook *book, float *a, int step){
-  encode_aux_threshmatch *tt=book->c->thresh_tree;
-
-#if 0
-  encode_aux_nearestmatch *nt=book->c->nearest_tree;
-  encode_aux_pigeonhole *pt=book->c->pigeon_tree;
-#endif
-  int dim=book->dim;
-  int k,o;
-  /*int savebest=-1;
-    float saverr;*/
-
-  /* do we have a threshhold encode hint? */
-  if(tt){
-    int index=0,i;
-    /* find the quant val of each scalar */
-    for(k=0,o=step*(dim-1);k<dim;k++,o-=step){
-
-      i=tt->threshvals>>1;
-      if(a[o]<tt->quantthresh[i]){
-
-        for(;i>0;i--)
-          if(a[o]>=tt->quantthresh[i-1])
-            break;
-
-      }else{
-
-        for(i++;i<tt->threshvals-1;i++)
-          if(a[o]<tt->quantthresh[i])break;
-
-      }
-
-      index=(index*tt->quantvals)+tt->quantmap[i];
-    }
-    /* regular lattices are easy :-) */
-    if(book->c->lengthlist[index]>0) /* is this unused?  If so, we'll
-                                        use a decision tree after all
-                                        and fall through*/
-      return(index);
-  }
-
-#if 0
-  /* do we have a pigeonhole encode hint? */
-  if(pt){
-    const static_codebook *c=book->c;
-    int i,besti=-1;
-    float best=0.f;
-    int entry=0;
-
-    /* dealing with sequentialness is a pain in the ass */
-    if(c->q_sequencep){
-      int pv;
-      long mul=1;
-      float qlast=0;
-      for(k=0,o=0;k<dim;k++,o+=step){
-        pv=(int)((a[o]-qlast-pt->min)/pt->del);
-        if(pv<0 || pv>=pt->mapentries)break;
-        entry+=pt->pigeonmap[pv]*mul;
-        mul*=pt->quantvals;
-        qlast+=pv*pt->del+pt->min;
-      }
-    }else{
-      for(k=0,o=step*(dim-1);k<dim;k++,o-=step){
-        int pv=(int)((a[o]-pt->min)/pt->del);
-        if(pv<0 || pv>=pt->mapentries)break;
-        entry=entry*pt->quantvals+pt->pigeonmap[pv];
-      }
-    }
-
-    /* must be within the pigeonholable range; if we quant outside (or
-       in an entry that we define no list for), brute force it */
-    if(k==dim && pt->fitlength[entry]){
-      /* search the abbreviated list */
-      long *list=pt->fitlist+pt->fitmap[entry];
-      for(i=0;i<pt->fitlength[entry];i++){
-        float this=_dist(dim,book->valuelist+list[i]*dim,a,step);
-        if(besti==-1 || this<best){
-          best=this;
-          besti=list[i];
-        }
-      }
-
-      return(besti);
-    }
-  }
-
-  if(nt){
-    /* optimized using the decision tree */
-    while(1){
-      float c=0.f;
-      float *p=book->valuelist+nt->p[ptr];
-      float *q=book->valuelist+nt->q[ptr];
-
-      for(k=0,o=0;k<dim;k++,o+=step)
-        c+=(p[k]-q[k])*(a[o]-(p[k]+q[k])*.5);
-
-      if(c>0.f) /* in A */
-        ptr= -nt->ptr0[ptr];
-      else     /* in B */
-        ptr= -nt->ptr1[ptr];
-      if(ptr<=0)break;
-    }
-    return(-ptr);
-  }
-#endif
-
-  /* brute force it! */
-  {
-    const static_codebook *c=book->c;
-    int i,besti=-1;
-    float best=0.f;
-    float *e=book->valuelist;
-    for(i=0;i<book->entries;i++){
-      if(c->lengthlist[i]>0){
-        float this=_dist(dim,e,a,step);
-        if(besti==-1 || this<best){
-          best=this;
-          besti=i;
-        }
-      }
-      e+=dim;
-    }
-
-    /*if(savebest!=-1 && savebest!=besti){
-      fprintf(stderr,"brute force/pigeonhole disagreement:\n"
-              "original:");
-      for(i=0;i<dim*step;i+=step)fprintf(stderr,"%g,",a[i]);
-      fprintf(stderr,"\n"
-              "pigeonhole (entry %d, err %g):",savebest,saverr);
-      for(i=0;i<dim;i++)fprintf(stderr,"%g,",
-                                (book->valuelist+savebest*dim)[i]);
-      fprintf(stderr,"\n"
-              "bruteforce (entry %d, err %g):",besti,best);
-      for(i=0;i<dim;i++)fprintf(stderr,"%g,",
-                                (book->valuelist+besti*dim)[i]);
-      fprintf(stderr,"\n");
-      }*/
-    return(besti);
-  }
-}
-
 long vorbis_book_codeword(codebook *book,int entry){
   if(book->c) /* only use with encode; decode optimizations are
                  allowed to break this */
@@ -638,7 +475,6 @@
   0,
   0,0,0,0,
   NULL,
-  NULL,NULL,NULL,
   0
 };
 static float *test1_result=NULL;
@@ -650,7 +486,6 @@
   2,
   -533200896,1611661312,4,0,
   full_quantlist1,
-  NULL,NULL,NULL,
   0
 };
 static float test2_result[]={-3,-2,-1,0, 1,2,3,4, 5,0,3,-2};
@@ -662,7 +497,6 @@
   2,
   -533200896,1611661312,4,1,
   full_quantlist1,
-  NULL,NULL,NULL,
   0
 };
 static float test3_result[]={-3,-5,-6,-6, 1,3,6,10, 5,5,8,6};
@@ -674,7 +508,6 @@
   1,
   -533200896,1611661312,4,0,
   partial_quantlist1,
-  NULL,NULL,NULL,
   0
 };
 static float test4_result[]={-3,-3,-3, 4,-3,-3, -1,-3,-3,
@@ -694,7 +527,6 @@
   1,
   -533200896,1611661312,4,1,
   partial_quantlist1,
-  NULL,NULL,NULL,
   0
 };
 static float test5_result[]={-3,-6,-9, 4, 1,-2, -1,-4,-7,



More information about the commits mailing list