Correct a path generation error

svn path=/branches/branch_monty_20011217/vorbis/; revision=2818

41 files changed, 205 insertions, 205 deletions

diff --git a/lib/books/floor/line_1024x31_0sub0.vqh b/lib/books/floor/line_1024x31_0sub0.vqh
index 7feefd7b..67054207 100644
--- a/lib/books/floor/line_1024x31_0sub0.vqh
+++ b/lib/books/floor/line_1024x31_0sub0.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_0sub0_VQH_
-#define _V_44l/line_1024x31_0sub0_VQH_
+#ifndef _V_line_1024x31_0sub0_VQH_
+#define _V_line_1024x31_0sub0_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_0sub0[] = {
+static long _huff_lengthlist_line_1024x31_0sub0[] = {
 	 4, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5,
 	 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_0sub0 = {
+static static_codebook _huff_book_line_1024x31_0sub0 = {
 	1, 32,
-	_huff_lengthlist_44l/line_1024x31_0sub0,
+	_huff_lengthlist_line_1024x31_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_0sub1.vqh b/lib/books/floor/line_1024x31_0sub1.vqh
index c568b866..cd2615ea 100644
--- a/lib/books/floor/line_1024x31_0sub1.vqh
+++ b/lib/books/floor/line_1024x31_0sub1.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_0sub1_VQH_
-#define _V_44l/line_1024x31_0sub1_VQH_
+#ifndef _V_line_1024x31_0sub1_VQH_
+#define _V_line_1024x31_0sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_0sub1[] = {
+static long _huff_lengthlist_line_1024x31_0sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_1024x31_0sub1[] = {
 	13,17,14,13,13,12,12,12,17,17,15,17,17,17,16,13,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_0sub1 = {
+static static_codebook _huff_book_line_1024x31_0sub1 = {
 	1, 128,
-	_huff_lengthlist_44l/line_1024x31_0sub1,
+	_huff_lengthlist_line_1024x31_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_1sub0.vqh b/lib/books/floor/line_1024x31_1sub0.vqh
index 8fe67aa9..e8d4fbf9 100644
--- a/lib/books/floor/line_1024x31_1sub0.vqh
+++ b/lib/books/floor/line_1024x31_1sub0.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_1sub0_VQH_
-#define _V_44l/line_1024x31_1sub0_VQH_
+#ifndef _V_line_1024x31_1sub0_VQH_
+#define _V_line_1024x31_1sub0_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_1sub0[] = {
+static long _huff_lengthlist_line_1024x31_1sub0[] = {
 	 2, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 	 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_1sub0 = {
+static static_codebook _huff_book_line_1024x31_1sub0 = {
 	1, 32,
-	_huff_lengthlist_44l/line_1024x31_1sub0,
+	_huff_lengthlist_line_1024x31_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_1sub1.vqh b/lib/books/floor/line_1024x31_1sub1.vqh
index 19020ae2..63616edf 100644
--- a/lib/books/floor/line_1024x31_1sub1.vqh
+++ b/lib/books/floor/line_1024x31_1sub1.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_1sub1_VQH_
-#define _V_44l/line_1024x31_1sub1_VQH_
+#ifndef _V_line_1024x31_1sub1_VQH_
+#define _V_line_1024x31_1sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_1sub1[] = {
+static long _huff_lengthlist_line_1024x31_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 6, 5,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_1024x31_1sub1[] = {
 	13,14,14,15,12,13,14,14,15,15,15,15,15,15,15,13,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_1sub1 = {
+static static_codebook _huff_book_line_1024x31_1sub1 = {
 	1, 128,
-	_huff_lengthlist_44l/line_1024x31_1sub1,
+	_huff_lengthlist_line_1024x31_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_2sub1.vqh b/lib/books/floor/line_1024x31_2sub1.vqh
index 7f357d4c..30a1ab90 100644
--- a/lib/books/floor/line_1024x31_2sub1.vqh
+++ b/lib/books/floor/line_1024x31_2sub1.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_2sub1_VQH_
-#define _V_44l/line_1024x31_2sub1_VQH_
+#ifndef _V_line_1024x31_2sub1_VQH_
+#define _V_line_1024x31_2sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_2sub1[] = {
+static long _huff_lengthlist_line_1024x31_2sub1[] = {
 	 0, 4, 4, 4, 4, 3, 5, 3, 5, 3, 5, 4, 5, 4, 5, 5,
 	 5, 5,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_2sub1 = {
+static static_codebook _huff_book_line_1024x31_2sub1 = {
 	1, 18,
-	_huff_lengthlist_44l/line_1024x31_2sub1,
+	_huff_lengthlist_line_1024x31_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_2sub2.vqh b/lib/books/floor/line_1024x31_2sub2.vqh
index 19dea971..a47983c9 100644
--- a/lib/books/floor/line_1024x31_2sub2.vqh
+++ b/lib/books/floor/line_1024x31_2sub2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_2sub2_VQH_
-#define _V_44l/line_1024x31_2sub2_VQH_
+#ifndef _V_line_1024x31_2sub2_VQH_
+#define _V_line_1024x31_2sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_2sub2[] = {
+static long _huff_lengthlist_line_1024x31_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 6, 5, 7,
 	 5, 8, 6, 8, 6,10, 6,10, 6,11, 7,11, 7,11, 7,12,
 	 8,12,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_2sub2 = {
+static static_codebook _huff_book_line_1024x31_2sub2 = {
 	1, 50,
-	_huff_lengthlist_44l/line_1024x31_2sub2,
+	_huff_lengthlist_line_1024x31_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_2sub3.vqh b/lib/books/floor/line_1024x31_2sub3.vqh
index 34d5e74c..0b5407b4 100644
--- a/lib/books/floor/line_1024x31_2sub3.vqh
+++ b/lib/books/floor/line_1024x31_2sub3.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_2sub3_VQH_
-#define _V_44l/line_1024x31_2sub3_VQH_
+#ifndef _V_line_1024x31_2sub3_VQH_
+#define _V_line_1024x31_2sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_2sub3[] = {
+static long _huff_lengthlist_line_1024x31_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_1024x31_2sub3[] = {
 	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_2sub3 = {
+static static_codebook _huff_book_line_1024x31_2sub3 = {
 	1, 128,
-	_huff_lengthlist_44l/line_1024x31_2sub3,
+	_huff_lengthlist_line_1024x31_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_3sub1.vqh b/lib/books/floor/line_1024x31_3sub1.vqh
index 9cc4af0e..cb1f8c40 100644
--- a/lib/books/floor/line_1024x31_3sub1.vqh
+++ b/lib/books/floor/line_1024x31_3sub1.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_3sub1_VQH_
-#define _V_44l/line_1024x31_3sub1_VQH_
+#ifndef _V_line_1024x31_3sub1_VQH_
+#define _V_line_1024x31_3sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_3sub1[] = {
+static long _huff_lengthlist_line_1024x31_3sub1[] = {
 	 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
 	 5, 5,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_3sub1 = {
+static static_codebook _huff_book_line_1024x31_3sub1 = {
 	1, 18,
-	_huff_lengthlist_44l/line_1024x31_3sub1,
+	_huff_lengthlist_line_1024x31_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_3sub2.vqh b/lib/books/floor/line_1024x31_3sub2.vqh
index 11897e37..e4e96923 100644
--- a/lib/books/floor/line_1024x31_3sub2.vqh
+++ b/lib/books/floor/line_1024x31_3sub2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_3sub2_VQH_
-#define _V_44l/line_1024x31_3sub2_VQH_
+#ifndef _V_line_1024x31_3sub2_VQH_
+#define _V_line_1024x31_3sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_3sub2[] = {
+static long _huff_lengthlist_line_1024x31_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 3, 3, 4, 4, 4, 4, 5, 4, 6, 4, 7, 4, 7, 5,
 	 8, 5, 8, 5, 9, 5, 9, 5,10, 6,10, 6,10, 6,11, 6,
 	11, 6,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_3sub2 = {
+static static_codebook _huff_book_line_1024x31_3sub2 = {
 	1, 50,
-	_huff_lengthlist_44l/line_1024x31_3sub2,
+	_huff_lengthlist_line_1024x31_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_3sub3.vqh b/lib/books/floor/line_1024x31_3sub3.vqh
index af355c04..9d48219a 100644
--- a/lib/books/floor/line_1024x31_3sub3.vqh
+++ b/lib/books/floor/line_1024x31_3sub3.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_3sub3_VQH_
-#define _V_44l/line_1024x31_3sub3_VQH_
+#ifndef _V_line_1024x31_3sub3_VQH_
+#define _V_line_1024x31_3sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_3sub3[] = {
+static long _huff_lengthlist_line_1024x31_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_1024x31_3sub3[] = {
 	14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_3sub3 = {
+static static_codebook _huff_book_line_1024x31_3sub3 = {
 	1, 128,
-	_huff_lengthlist_44l/line_1024x31_3sub3,
+	_huff_lengthlist_line_1024x31_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_class0.vqh b/lib/books/floor/line_1024x31_class0.vqh
index 7c023132..38bff2b3 100644
--- a/lib/books/floor/line_1024x31_class0.vqh
+++ b/lib/books/floor/line_1024x31_class0.vqh
@@ -14,17 +14,17 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_class0_VQH_
-#define _V_44l/line_1024x31_class0_VQH_
+#ifndef _V_line_1024x31_class0_VQH_
+#define _V_line_1024x31_class0_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_class0[] = {
+static long _huff_lengthlist_line_1024x31_class0[] = {
 	 1, 3, 4, 4, 3, 4, 5, 5,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_class0 = {
+static static_codebook _huff_book_line_1024x31_class0 = {
 	1, 8,
-	_huff_lengthlist_44l/line_1024x31_class0,
+	_huff_lengthlist_line_1024x31_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_class1.vqh b/lib/books/floor/line_1024x31_class1.vqh
index 414eef09..f74ace2e 100644
--- a/lib/books/floor/line_1024x31_class1.vqh
+++ b/lib/books/floor/line_1024x31_class1.vqh
@@ -14,17 +14,17 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_class1_VQH_
-#define _V_44l/line_1024x31_class1_VQH_
+#ifndef _V_line_1024x31_class1_VQH_
+#define _V_line_1024x31_class1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_class1[] = {
+static long _huff_lengthlist_line_1024x31_class1[] = {
 	 1, 3, 5, 8, 5,10, 9,13, 2, 5, 6, 8, 8,12,11,13,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_class1 = {
+static static_codebook _huff_book_line_1024x31_class1 = {
 	1, 16,
-	_huff_lengthlist_44l/line_1024x31_class1,
+	_huff_lengthlist_line_1024x31_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_class2.vqh b/lib/books/floor/line_1024x31_class2.vqh
index 78dc137f..99b8f6e2 100644
--- a/lib/books/floor/line_1024x31_class2.vqh
+++ b/lib/books/floor/line_1024x31_class2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_class2_VQH_
-#define _V_44l/line_1024x31_class2_VQH_
+#ifndef _V_line_1024x31_class2_VQH_
+#define _V_line_1024x31_class2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_class2[] = {
+static long _huff_lengthlist_line_1024x31_class2[] = {
 	 1, 3, 5,12, 8, 4, 6,12,10, 7, 8,14,17,20,20,14,
 	 6, 3, 6,12, 8, 5, 6,10,11, 7, 9,12,20,19,20,17,
 	12, 7, 8,14,12, 7, 7,13,14,10,11,18,20,20,20,20,
 	18,18,15,17,20,18,16,17,20,19,17,19,19,19,19,19,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_class2 = {
+static static_codebook _huff_book_line_1024x31_class2 = {
 	1, 64,
-	_huff_lengthlist_44l/line_1024x31_class2,
+	_huff_lengthlist_line_1024x31_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_class3.vqh b/lib/books/floor/line_1024x31_class3.vqh
index 3ea69c3b..fc546618 100644
--- a/lib/books/floor/line_1024x31_class3.vqh
+++ b/lib/books/floor/line_1024x31_class3.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_1024x31_class3_VQH_
-#define _V_44l/line_1024x31_class3_VQH_
+#ifndef _V_line_1024x31_class3_VQH_
+#define _V_line_1024x31_class3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_1024x31_class3[] = {
+static long _huff_lengthlist_line_1024x31_class3[] = {
 	 1, 4, 5,11, 7, 4, 6,12,11, 8, 9,13,18,14,14,16,
 	 7, 3, 5,11, 8, 4, 6,12,11, 8,10,14,20,20,20,20,
 	11, 6, 6, 8,11, 7, 7,10,13, 9,12,15,20,20,19,20,
 	17,14,12, 8,18,14,12,10,20,16,15,14,20,20,19,19,
 };
 
-static static_codebook _huff_book_44l/line_1024x31_class3 = {
+static static_codebook _huff_book_line_1024x31_class3 = {
 	1, 64,
-	_huff_lengthlist_44l/line_1024x31_class3,
+	_huff_lengthlist_line_1024x31_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_0sub0.vqh b/lib/books/floor/line_128x19_0sub0.vqh
index 6f9ea89e..c7c0b296 100644
--- a/lib/books/floor/line_128x19_0sub0.vqh
+++ b/lib/books/floor/line_128x19_0sub0.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_0sub0_VQH_
-#define _V_44l/line_128x19_0sub0_VQH_
+#ifndef _V_line_128x19_0sub0_VQH_
+#define _V_line_128x19_0sub0_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_0sub0[] = {
+static long _huff_lengthlist_line_128x19_0sub0[] = {
 	 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5,
 	 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 6,
 	 7, 6, 7, 6, 8, 6, 8, 6, 8, 6, 8, 6, 8, 7, 8, 7,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_128x19_0sub0[] = {
 	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
 };
 
-static static_codebook _huff_book_44l/line_128x19_0sub0 = {
+static static_codebook _huff_book_line_128x19_0sub0 = {
 	1, 128,
-	_huff_lengthlist_44l/line_128x19_0sub0,
+	_huff_lengthlist_line_128x19_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_1sub1.vqh b/lib/books/floor/line_128x19_1sub1.vqh
index d40f4b13..c7699ccc 100644
--- a/lib/books/floor/line_128x19_1sub1.vqh
+++ b/lib/books/floor/line_128x19_1sub1.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_1sub1_VQH_
-#define _V_44l/line_128x19_1sub1_VQH_
+#ifndef _V_line_128x19_1sub1_VQH_
+#define _V_line_128x19_1sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_1sub1[] = {
+static long _huff_lengthlist_line_128x19_1sub1[] = {
 	 0, 4, 5, 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 4, 5, 4,
 	 6, 4, 6, 5, 6, 5, 6, 6, 6,
 };
 
-static static_codebook _huff_book_44l/line_128x19_1sub1 = {
+static static_codebook _huff_book_line_128x19_1sub1 = {
 	1, 25,
-	_huff_lengthlist_44l/line_128x19_1sub1,
+	_huff_lengthlist_line_128x19_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_1sub2.vqh b/lib/books/floor/line_128x19_1sub2.vqh
index 81846c55..73605937 100644
--- a/lib/books/floor/line_128x19_1sub2.vqh
+++ b/lib/books/floor/line_128x19_1sub2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_1sub2_VQH_
-#define _V_44l/line_128x19_1sub2_VQH_
+#ifndef _V_line_128x19_1sub2_VQH_
+#define _V_line_128x19_1sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_1sub2[] = {
+static long _huff_lengthlist_line_128x19_1sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0,15,15,15,15,15,15,14, 3, 2, 4, 3, 4, 3, 5,
 	 4, 6, 5, 6, 5, 7, 6, 7, 7, 8, 7, 9, 8, 9, 9,11,
 	10,12,
 };
 
-static static_codebook _huff_book_44l/line_128x19_1sub2 = {
+static static_codebook _huff_book_line_128x19_1sub2 = {
 	1, 50,
-	_huff_lengthlist_44l/line_128x19_1sub2,
+	_huff_lengthlist_line_128x19_1sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_1sub3.vqh b/lib/books/floor/line_128x19_1sub3.vqh
index fd7d9d13..a781f871 100644
--- a/lib/books/floor/line_128x19_1sub3.vqh
+++ b/lib/books/floor/line_128x19_1sub3.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_1sub3_VQH_
-#define _V_44l/line_128x19_1sub3_VQH_
+#ifndef _V_line_128x19_1sub3_VQH_
+#define _V_line_128x19_1sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_1sub3[] = {
+static long _huff_lengthlist_line_128x19_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_128x19_1sub3[] = {
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_44l/line_128x19_1sub3 = {
+static static_codebook _huff_book_line_128x19_1sub3 = {
 	1, 128,
-	_huff_lengthlist_44l/line_128x19_1sub3,
+	_huff_lengthlist_line_128x19_1sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_2sub1.vqh b/lib/books/floor/line_128x19_2sub1.vqh
index 7d1f802c..48c63def 100644
--- a/lib/books/floor/line_128x19_2sub1.vqh
+++ b/lib/books/floor/line_128x19_2sub1.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_2sub1_VQH_
-#define _V_44l/line_128x19_2sub1_VQH_
+#ifndef _V_line_128x19_2sub1_VQH_
+#define _V_line_128x19_2sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_2sub1[] = {
+static long _huff_lengthlist_line_128x19_2sub1[] = {
 	 0, 4, 4, 4, 4, 4, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4,
 	 5, 4,
 };
 
-static static_codebook _huff_book_44l/line_128x19_2sub1 = {
+static static_codebook _huff_book_line_128x19_2sub1 = {
 	1, 18,
-	_huff_lengthlist_44l/line_128x19_2sub1,
+	_huff_lengthlist_line_128x19_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_2sub2.vqh b/lib/books/floor/line_128x19_2sub2.vqh
index 6f39c116..b4a10a3f 100644
--- a/lib/books/floor/line_128x19_2sub2.vqh
+++ b/lib/books/floor/line_128x19_2sub2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_2sub2_VQH_
-#define _V_44l/line_128x19_2sub2_VQH_
+#ifndef _V_line_128x19_2sub2_VQH_
+#define _V_line_128x19_2sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_2sub2[] = {
+static long _huff_lengthlist_line_128x19_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 4, 3, 4, 3, 5, 4, 6, 4, 6, 4, 7, 4, 7, 4,
 	 8, 5, 8, 5, 9, 5, 9, 5,10, 5,10, 6,10, 6,11, 6,
 	11, 6,
 };
 
-static static_codebook _huff_book_44l/line_128x19_2sub2 = {
+static static_codebook _huff_book_line_128x19_2sub2 = {
 	1, 50,
-	_huff_lengthlist_44l/line_128x19_2sub2,
+	_huff_lengthlist_line_128x19_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_2sub3.vqh b/lib/books/floor/line_128x19_2sub3.vqh
index f6c8e2f1..885ca48b 100644
--- a/lib/books/floor/line_128x19_2sub3.vqh
+++ b/lib/books/floor/line_128x19_2sub3.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_2sub3_VQH_
-#define _V_44l/line_128x19_2sub3_VQH_
+#ifndef _V_line_128x19_2sub3_VQH_
+#define _V_line_128x19_2sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_2sub3[] = {
+static long _huff_lengthlist_line_128x19_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -29,9 +29,9 @@ static long _huff_lengthlist_44l/line_128x19_2sub3[] = {
 	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
 };
 
-static static_codebook _huff_book_44l/line_128x19_2sub3 = {
+static static_codebook _huff_book_line_128x19_2sub3 = {
 	1, 128,
-	_huff_lengthlist_44l/line_128x19_2sub3,
+	_huff_lengthlist_line_128x19_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_class1.vqh b/lib/books/floor/line_128x19_class1.vqh
index 7b02710e..8e519f60 100644
--- a/lib/books/floor/line_128x19_class1.vqh
+++ b/lib/books/floor/line_128x19_class1.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_class1_VQH_
-#define _V_44l/line_128x19_class1_VQH_
+#ifndef _V_line_128x19_class1_VQH_
+#define _V_line_128x19_class1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_class1[] = {
+static long _huff_lengthlist_line_128x19_class1[] = {
 	 1, 2, 7,14, 8, 3, 6,17,14,11,13,19,19,19,19,19,
 	 8, 4, 8,13,10, 6,10,18,15,11,15,19,19,19,19,19,
 	13, 8,13,18,13, 8,14,19,19,16,19,19,19,19,19,19,
 	19,19,19,19,19,16,19,19,19,18,18,18,18,18,18,18,
 };
 
-static static_codebook _huff_book_44l/line_128x19_class1 = {
+static static_codebook _huff_book_line_128x19_class1 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x19_class1,
+	_huff_lengthlist_line_128x19_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x19_class2.vqh b/lib/books/floor/line_128x19_class2.vqh
index feeb54a2..fd57d5cc 100644
--- a/lib/books/floor/line_128x19_class2.vqh
+++ b/lib/books/floor/line_128x19_class2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x19_class2_VQH_
-#define _V_44l/line_128x19_class2_VQH_
+#ifndef _V_line_128x19_class2_VQH_
+#define _V_line_128x19_class2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x19_class2[] = {
+static long _huff_lengthlist_line_128x19_class2[] = {
 	 2, 3, 4,11, 7, 4, 5,12,10, 7, 8,15,18,16,14,17,
 	 7, 3, 4,11, 8, 4, 5,12,10, 7, 8,15,18,16,16,16,
 	10, 5, 5, 6,11, 6, 6, 8,13, 9, 9,12,17,17,17,17,
 	17,16,10, 6,17,14,11, 8,17,17,12,11,17,17,17,17,
 };
 
-static static_codebook _huff_book_44l/line_128x19_class2 = {
+static static_codebook _huff_book_line_128x19_class2 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x19_class2,
+	_huff_lengthlist_line_128x19_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_0sub0.vqh b/lib/books/floor/line_128x7_0sub0.vqh
index f6fc186f..084df02d 100644
--- a/lib/books/floor/line_128x7_0sub0.vqh
+++ b/lib/books/floor/line_128x7_0sub0.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_0sub0_VQH_
-#define _V_44l/line_128x7_0sub0_VQH_
+#ifndef _V_line_128x7_0sub0_VQH_
+#define _V_line_128x7_0sub0_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_0sub0[] = {
+static long _huff_lengthlist_line_128x7_0sub0[] = {
 	 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 	 5, 5, 5, 5, 6, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 9,
 	 7,11, 7,13, 8,15, 9,15, 9,15, 9,13,10,15,11,14,
 	12,14,12,13,13,14,13,14,14,14,14,14,14,14,14,14,
 };
 
-static static_codebook _huff_book_44l/line_128x7_0sub0 = {
+static static_codebook _huff_book_line_128x7_0sub0 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x7_0sub0,
+	_huff_lengthlist_line_128x7_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_1sub1.vqh b/lib/books/floor/line_128x7_1sub1.vqh
index 41999404..9b39612b 100644
--- a/lib/books/floor/line_128x7_1sub1.vqh
+++ b/lib/books/floor/line_128x7_1sub1.vqh
@@ -14,17 +14,17 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_1sub1_VQH_
-#define _V_44l/line_128x7_1sub1_VQH_
+#ifndef _V_line_128x7_1sub1_VQH_
+#define _V_line_128x7_1sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_1sub1[] = {
+static long _huff_lengthlist_line_128x7_1sub1[] = {
 	 0, 3, 3, 3, 3, 3, 3, 3, 3,
 };
 
-static static_codebook _huff_book_44l/line_128x7_1sub1 = {
+static static_codebook _huff_book_line_128x7_1sub1 = {
 	1, 9,
-	_huff_lengthlist_44l/line_128x7_1sub1,
+	_huff_lengthlist_line_128x7_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_1sub2.vqh b/lib/books/floor/line_128x7_1sub2.vqh
index 03ae49ec..348bd251 100644
--- a/lib/books/floor/line_128x7_1sub2.vqh
+++ b/lib/books/floor/line_128x7_1sub2.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_1sub2_VQH_
-#define _V_44l/line_128x7_1sub2_VQH_
+#ifndef _V_line_128x7_1sub2_VQH_
+#define _V_line_128x7_1sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_1sub2[] = {
+static long _huff_lengthlist_line_128x7_1sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 4, 3, 5,
 	 4, 7, 5, 7, 5, 9, 7, 9, 8,
 };
 
-static static_codebook _huff_book_44l/line_128x7_1sub2 = {
+static static_codebook _huff_book_line_128x7_1sub2 = {
 	1, 25,
-	_huff_lengthlist_44l/line_128x7_1sub2,
+	_huff_lengthlist_line_128x7_1sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_1sub3.vqh b/lib/books/floor/line_128x7_1sub3.vqh
index 2429f9b7..b475f442 100644
--- a/lib/books/floor/line_128x7_1sub3.vqh
+++ b/lib/books/floor/line_128x7_1sub3.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_1sub3_VQH_
-#define _V_44l/line_128x7_1sub3_VQH_
+#ifndef _V_line_128x7_1sub3_VQH_
+#define _V_line_128x7_1sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_1sub3[] = {
+static long _huff_lengthlist_line_128x7_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 5, 4, 6, 4, 6,
 	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
 
-static static_codebook _huff_book_44l/line_128x7_1sub3 = {
+static static_codebook _huff_book_line_128x7_1sub3 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x7_1sub3,
+	_huff_lengthlist_line_128x7_1sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_2sub1.vqh b/lib/books/floor/line_128x7_2sub1.vqh
index eb2fdfa9..689987e8 100644
--- a/lib/books/floor/line_128x7_2sub1.vqh
+++ b/lib/books/floor/line_128x7_2sub1.vqh
@@ -14,17 +14,17 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_2sub1_VQH_
-#define _V_44l/line_128x7_2sub1_VQH_
+#ifndef _V_line_128x7_2sub1_VQH_
+#define _V_line_128x7_2sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_2sub1[] = {
+static long _huff_lengthlist_line_128x7_2sub1[] = {
 	 0, 3, 3, 3, 3, 3, 3, 3, 3,
 };
 
-static static_codebook _huff_book_44l/line_128x7_2sub1 = {
+static static_codebook _huff_book_line_128x7_2sub1 = {
 	1, 9,
-	_huff_lengthlist_44l/line_128x7_2sub1,
+	_huff_lengthlist_line_128x7_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_2sub2.vqh b/lib/books/floor/line_128x7_2sub2.vqh
index a891f4cb..620efaf3 100644
--- a/lib/books/floor/line_128x7_2sub2.vqh
+++ b/lib/books/floor/line_128x7_2sub2.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_2sub2_VQH_
-#define _V_44l/line_128x7_2sub2_VQH_
+#ifndef _V_line_128x7_2sub2_VQH_
+#define _V_line_128x7_2sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_2sub2[] = {
+static long _huff_lengthlist_line_128x7_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4, 4,
 	 4, 4, 5, 5, 5, 5, 6, 5, 6,
 };
 
-static static_codebook _huff_book_44l/line_128x7_2sub2 = {
+static static_codebook _huff_book_line_128x7_2sub2 = {
 	1, 25,
-	_huff_lengthlist_44l/line_128x7_2sub2,
+	_huff_lengthlist_line_128x7_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_2sub3.vqh b/lib/books/floor/line_128x7_2sub3.vqh
index 9886c44c..834e7c0b 100644
--- a/lib/books/floor/line_128x7_2sub3.vqh
+++ b/lib/books/floor/line_128x7_2sub3.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_2sub3_VQH_
-#define _V_44l/line_128x7_2sub3_VQH_
+#ifndef _V_line_128x7_2sub3_VQH_
+#define _V_line_128x7_2sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_2sub3[] = {
+static long _huff_lengthlist_line_128x7_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 4, 4,
 	 4, 4, 4, 5, 6, 6, 6, 9, 7, 9, 7, 9, 7,11, 8,11,
 	 9,11,11,11,10,11,11,11,11,11,10,10,10,10,10,10,
 };
 
-static static_codebook _huff_book_44l/line_128x7_2sub3 = {
+static static_codebook _huff_book_line_128x7_2sub3 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x7_2sub3,
+	_huff_lengthlist_line_128x7_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_class1.vqh b/lib/books/floor/line_128x7_class1.vqh
index ca209a45..bb64e4c5 100644
--- a/lib/books/floor/line_128x7_class1.vqh
+++ b/lib/books/floor/line_128x7_class1.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_class1_VQH_
-#define _V_44l/line_128x7_class1_VQH_
+#ifndef _V_line_128x7_class1_VQH_
+#define _V_line_128x7_class1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_class1[] = {
+static long _huff_lengthlist_line_128x7_class1[] = {
 	 2, 3, 4,14,11, 8, 9,15,12, 9,10,15,15,15,15,15,
 	 5, 2, 4,14,11, 8,10,15,13,11,12,15,15,15,15,15,
 	 5, 3, 5,13,11, 7, 8,15,14,11,12,15,15,15,15,15,
 	14,11,12,14,14,13,13,14,14,14,14,14,14,14,14,14,
 };
 
-static static_codebook _huff_book_44l/line_128x7_class1 = {
+static static_codebook _huff_book_line_128x7_class1 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x7_class1,
+	_huff_lengthlist_line_128x7_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x7_class2.vqh b/lib/books/floor/line_128x7_class2.vqh
index be6daeaa..47eae7e9 100644
--- a/lib/books/floor/line_128x7_class2.vqh
+++ b/lib/books/floor/line_128x7_class2.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x7_class2_VQH_
-#define _V_44l/line_128x7_class2_VQH_
+#ifndef _V_line_128x7_class2_VQH_
+#define _V_line_128x7_class2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x7_class2[] = {
+static long _huff_lengthlist_line_128x7_class2[] = {
 	 9, 7, 7,11, 7, 5, 5, 9, 9, 6, 6, 8,13,11, 9,14,
 	 7, 5, 5, 9, 5, 3, 3, 7, 6, 4, 4, 6,10, 8, 7, 9,
 	 9, 6, 6,10, 7, 4, 4, 7, 7, 4, 4, 7,13, 9, 7, 9,
 	13,12,12,14,11, 9,10,14,11, 9, 9,11,14,13,12,10,
 };
 
-static static_codebook _huff_book_44l/line_128x7_class2 = {
+static static_codebook _huff_book_line_128x7_class2 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x7_class2,
+	_huff_lengthlist_line_128x7_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_0sub0.vqh b/lib/books/floor/line_128x9_0sub0.vqh
index 10071258..d0d4804f 100644
--- a/lib/books/floor/line_128x9_0sub0.vqh
+++ b/lib/books/floor/line_128x9_0sub0.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_0sub0_VQH_
-#define _V_44l/line_128x9_0sub0_VQH_
+#ifndef _V_line_128x9_0sub0_VQH_
+#define _V_line_128x9_0sub0_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_0sub0[] = {
+static long _huff_lengthlist_line_128x9_0sub0[] = {
 	 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, 4, 6,
 	 5, 7, 5, 7, 5, 7, 5, 8, 6, 8, 6, 8, 6, 9, 6,10,
 	 7,11, 7,13, 8,14, 8,13, 9,12, 9,11, 9,11, 9,11,
 	 9,10, 9,11,11,13,15,15,15,15,15,15,15,15,15,15,
 };
 
-static static_codebook _huff_book_44l/line_128x9_0sub0 = {
+static static_codebook _huff_book_line_128x9_0sub0 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x9_0sub0,
+	_huff_lengthlist_line_128x9_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_1sub1.vqh b/lib/books/floor/line_128x9_1sub1.vqh
index 914dda67..67ed69a9 100644
--- a/lib/books/floor/line_128x9_1sub1.vqh
+++ b/lib/books/floor/line_128x9_1sub1.vqh
@@ -14,17 +14,17 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_1sub1_VQH_
-#define _V_44l/line_128x9_1sub1_VQH_
+#ifndef _V_line_128x9_1sub1_VQH_
+#define _V_line_128x9_1sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_1sub1[] = {
+static long _huff_lengthlist_line_128x9_1sub1[] = {
 	 0, 4, 3, 4, 3, 4, 2, 4, 2,
 };
 
-static static_codebook _huff_book_44l/line_128x9_1sub1 = {
+static static_codebook _huff_book_line_128x9_1sub1 = {
 	1, 9,
-	_huff_lengthlist_44l/line_128x9_1sub1,
+	_huff_lengthlist_line_128x9_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_1sub2.vqh b/lib/books/floor/line_128x9_1sub2.vqh
index cdc7db4d..e678ca2a 100644
--- a/lib/books/floor/line_128x9_1sub2.vqh
+++ b/lib/books/floor/line_128x9_1sub2.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_1sub2_VQH_
-#define _V_44l/line_128x9_1sub2_VQH_
+#ifndef _V_line_128x9_1sub2_VQH_
+#define _V_line_128x9_1sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_1sub2[] = {
+static long _huff_lengthlist_line_128x9_1sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 5, 2, 7, 3, 8,
 	 3, 9, 4,10, 5,11, 5,11, 6,
 };
 
-static static_codebook _huff_book_44l/line_128x9_1sub2 = {
+static static_codebook _huff_book_line_128x9_1sub2 = {
 	1, 25,
-	_huff_lengthlist_44l/line_128x9_1sub2,
+	_huff_lengthlist_line_128x9_1sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_1sub3.vqh b/lib/books/floor/line_128x9_1sub3.vqh
index 324adf28..ca81050e 100644
--- a/lib/books/floor/line_128x9_1sub3.vqh
+++ b/lib/books/floor/line_128x9_1sub3.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_1sub3_VQH_
-#define _V_44l/line_128x9_1sub3_VQH_
+#ifndef _V_line_128x9_1sub3_VQH_
+#define _V_line_128x9_1sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_1sub3[] = {
+static long _huff_lengthlist_line_128x9_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 1, 7, 3, 7, 4, 7,
 	 5, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_44l/line_128x9_1sub3 = {
+static static_codebook _huff_book_line_128x9_1sub3 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x9_1sub3,
+	_huff_lengthlist_line_128x9_1sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_2sub1.vqh b/lib/books/floor/line_128x9_2sub1.vqh
index 50336ea0..754ba4bf 100644
--- a/lib/books/floor/line_128x9_2sub1.vqh
+++ b/lib/books/floor/line_128x9_2sub1.vqh
@@ -14,17 +14,17 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_2sub1_VQH_
-#define _V_44l/line_128x9_2sub1_VQH_
+#ifndef _V_line_128x9_2sub1_VQH_
+#define _V_line_128x9_2sub1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_2sub1[] = {
+static long _huff_lengthlist_line_128x9_2sub1[] = {
 	 0, 3, 3, 2, 3, 3, 4, 3, 4,
 };
 
-static static_codebook _huff_book_44l/line_128x9_2sub1 = {
+static static_codebook _huff_book_line_128x9_2sub1 = {
 	1, 9,
-	_huff_lengthlist_44l/line_128x9_2sub1,
+	_huff_lengthlist_line_128x9_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_2sub2.vqh b/lib/books/floor/line_128x9_2sub2.vqh
index cfcc0c2a..8ea35b1d 100644
--- a/lib/books/floor/line_128x9_2sub2.vqh
+++ b/lib/books/floor/line_128x9_2sub2.vqh
@@ -14,18 +14,18 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_2sub2_VQH_
-#define _V_44l/line_128x9_2sub2_VQH_
+#ifndef _V_line_128x9_2sub2_VQH_
+#define _V_line_128x9_2sub2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_2sub2[] = {
+static long _huff_lengthlist_line_128x9_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 4, 3, 5, 3,
 	 6, 4, 7, 4, 8, 5, 9, 5, 9,
 };
 
-static static_codebook _huff_book_44l/line_128x9_2sub2 = {
+static static_codebook _huff_book_line_128x9_2sub2 = {
 	1, 25,
-	_huff_lengthlist_44l/line_128x9_2sub2,
+	_huff_lengthlist_line_128x9_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_2sub3.vqh b/lib/books/floor/line_128x9_2sub3.vqh
index 71be5a08..90280dd6 100644
--- a/lib/books/floor/line_128x9_2sub3.vqh
+++ b/lib/books/floor/line_128x9_2sub3.vqh
@@ -14,20 +14,20 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_2sub3_VQH_
-#define _V_44l/line_128x9_2sub3_VQH_
+#ifndef _V_line_128x9_2sub3_VQH_
+#define _V_line_128x9_2sub3_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_2sub3[] = {
+static long _huff_lengthlist_line_128x9_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 7, 2, 8, 3, 9, 3,
 	 9, 4, 8, 4, 9, 4,12, 6,12, 6,11, 8,13, 9,11,12,
 	12,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
 };
 
-static static_codebook _huff_book_44l/line_128x9_2sub3 = {
+static static_codebook _huff_book_line_128x9_2sub3 = {
 	1, 64,
-	_huff_lengthlist_44l/line_128x9_2sub3,
+	_huff_lengthlist_line_128x9_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_class1.vqh b/lib/books/floor/line_128x9_class1.vqh
index 3411b80b..364e7ba1 100644
--- a/lib/books/floor/line_128x9_class1.vqh
+++ b/lib/books/floor/line_128x9_class1.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_class1_VQH_
-#define _V_44l/line_128x9_class1_VQH_
+#ifndef _V_line_128x9_class1_VQH_
+#define _V_line_128x9_class1_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_class1[] = {
+static long _huff_lengthlist_line_128x9_class1[] = {
 	 3, 3, 3,11,14,12,10,16,16, 9,12,16,16,16,16,16,
 	 5, 2, 2,10,13,11, 8,13,15,11,11,14,16,16,16,16,
 	 7, 5, 5,10,12,10, 8,14,16,13,13,16,16,16,16,16,
@@ -37,9 +37,9 @@ static long _huff_lengthlist_44l/line_128x9_class1[] = {
 	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
-static static_codebook _huff_book_44l/line_128x9_class1 = {
+static static_codebook _huff_book_line_128x9_class1 = {
 	1, 256,
-	_huff_lengthlist_44l/line_128x9_class1,
+	_huff_lengthlist_line_128x9_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
diff --git a/lib/books/floor/line_128x9_class2.vqh b/lib/books/floor/line_128x9_class2.vqh
index ac08a310..010f56a4 100644
--- a/lib/books/floor/line_128x9_class2.vqh
+++ b/lib/books/floor/line_128x9_class2.vqh
@@ -14,11 +14,11 @@
 
  ********************************************************************/
 
-#ifndef _V_44l/line_128x9_class2_VQH_
-#define _V_44l/line_128x9_class2_VQH_
+#ifndef _V_line_128x9_class2_VQH_
+#define _V_line_128x9_class2_VQH_
 #include "codebook.h"
 
-static long _huff_lengthlist_44l/line_128x9_class2[] = {
+static long _huff_lengthlist_line_128x9_class2[] = {
 	 7, 6, 8,10, 8, 5, 6, 8,11, 8, 8,10,17,17,14,16,
 	 8, 5, 6, 9, 7, 4, 5, 8, 9, 6, 7, 9,14,12,13,16,
 	11, 8, 7,10, 9, 6, 7,10,11, 8, 8,11,16,13,12,16,
@@ -37,9 +37,9 @@ static long _huff_lengthlist_44l/line_128x9_class2[] = {
 	16,16,16,16,16,16,16,15,16,16,16,14,16,16,16,16,
 };
 
-static static_codebook _huff_book_44l/line_128x9_class2 = {
+static static_codebook _huff_book_line_128x9_class2 = {
 	1, 256,
-	_huff_lengthlist_44l/line_128x9_class2,
+	_huff_lengthlist_line_128x9_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,