Move libfaad in contrib/ and contextually move the plugin in src/libxineadec/.

--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libfaad/analysis.h => contrib/libfaad/analysis.h
rename : src/libfaad/bits.c => contrib/libfaad/bits.c
rename : src/libfaad/bits.h => contrib/libfaad/bits.h
rename : src/libfaad/cfft.c => contrib/libfaad/cfft.c
rename : src/libfaad/cfft.h => contrib/libfaad/cfft.h
rename : src/libfaad/cfft_tab.h => contrib/libfaad/cfft_tab.h
rename : src/libfaad/codebook/Makefile.am => contrib/libfaad/codebook/Makefile.am
rename : src/libfaad/codebook/hcb.h => contrib/libfaad/codebook/hcb.h
rename : src/libfaad/codebook/hcb_1.h => contrib/libfaad/codebook/hcb_1.h
rename : src/libfaad/codebook/hcb_10.h => contrib/libfaad/codebook/hcb_10.h
rename : src/libfaad/codebook/hcb_11.h => contrib/libfaad/codebook/hcb_11.h
rename : src/libfaad/codebook/hcb_2.h => contrib/libfaad/codebook/hcb_2.h
rename : src/libfaad/codebook/hcb_3.h => contrib/libfaad/codebook/hcb_3.h
rename : src/libfaad/codebook/hcb_4.h => contrib/libfaad/codebook/hcb_4.h
rename : src/libfaad/codebook/hcb_5.h => contrib/libfaad/codebook/hcb_5.h
rename : src/libfaad/codebook/hcb_6.h => contrib/libfaad/codebook/hcb_6.h
rename : src/libfaad/codebook/hcb_7.h => contrib/libfaad/codebook/hcb_7.h
rename : src/libfaad/codebook/hcb_8.h => contrib/libfaad/codebook/hcb_8.h
rename : src/libfaad/codebook/hcb_9.h => contrib/libfaad/codebook/hcb_9.h
rename : src/libfaad/codebook/hcb_sf.h => contrib/libfaad/codebook/hcb_sf.h
rename : src/libfaad/common.c => contrib/libfaad/common.c
rename : src/libfaad/common.h => contrib/libfaad/common.h
rename : src/libfaad/decoder.c => contrib/libfaad/decoder.c
rename : src/libfaad/decoder.h => contrib/libfaad/decoder.h
rename : src/libfaad/diff_to_faad2_cvs.patch => contrib/libfaad/diff_to_faad2_cvs.patch
rename : src/libfaad/drc.c => contrib/libfaad/drc.c
rename : src/libfaad/drc.h => contrib/libfaad/drc.h
rename : src/libfaad/drm_dec.c => contrib/libfaad/drm_dec.c
rename : src/libfaad/drm_dec.h => contrib/libfaad/drm_dec.h
rename : src/libfaad/error.c => contrib/libfaad/error.c
rename : src/libfaad/error.h => contrib/libfaad/error.h
rename : src/libfaad/faad.h => contrib/libfaad/faad.h
rename : src/libfaad/filtbank.c => contrib/libfaad/filtbank.c
rename : src/libfaad/filtbank.h => contrib/libfaad/filtbank.h
rename : src/libfaad/fixed.h => contrib/libfaad/fixed.h
rename : src/libfaad/hcr.c => contrib/libfaad/hcr.c
rename : src/libfaad/huffman.c => contrib/libfaad/huffman.c
rename : src/libfaad/huffman.h => contrib/libfaad/huffman.h
rename : src/libfaad/ic_predict.c => contrib/libfaad/ic_predict.c
rename : src/libfaad/ic_predict.h => contrib/libfaad/ic_predict.h
rename : src/libfaad/iq_table.h => contrib/libfaad/iq_table.h
rename : src/libfaad/is.c => contrib/libfaad/is.c
rename : src/libfaad/is.h => contrib/libfaad/is.h
rename : src/libfaad/kbd_win.h => contrib/libfaad/kbd_win.h
rename : src/libfaad/lt_predict.c => contrib/libfaad/lt_predict.c
rename : src/libfaad/lt_predict.h => contrib/libfaad/lt_predict.h
rename : src/libfaad/mdct.c => contrib/libfaad/mdct.c
rename : src/libfaad/mdct.h => contrib/libfaad/mdct.h
rename : src/libfaad/mdct_tab.h => contrib/libfaad/mdct_tab.h
rename : src/libfaad/mp4.c => contrib/libfaad/mp4.c
rename : src/libfaad/mp4.h => contrib/libfaad/mp4.h
rename : src/libfaad/ms.c => contrib/libfaad/ms.c
rename : src/libfaad/ms.h => contrib/libfaad/ms.h
rename : src/libfaad/output.c => contrib/libfaad/output.c
rename : src/libfaad/output.h => contrib/libfaad/output.h
rename : src/libfaad/pns.c => contrib/libfaad/pns.c
rename : src/libfaad/pns.h => contrib/libfaad/pns.h
rename : src/libfaad/ps_dec.c => contrib/libfaad/ps_dec.c
rename : src/libfaad/ps_dec.h => contrib/libfaad/ps_dec.h
rename : src/libfaad/ps_syntax.c => contrib/libfaad/ps_syntax.c
rename : src/libfaad/ps_tables.h => contrib/libfaad/ps_tables.h
rename : src/libfaad/pulse.c => contrib/libfaad/pulse.c
rename : src/libfaad/pulse.h => contrib/libfaad/pulse.h
rename : src/libfaad/rvlc.c => contrib/libfaad/rvlc.c
rename : src/libfaad/rvlc.h => contrib/libfaad/rvlc.h
rename : src/libfaad/sbr_dct.c => contrib/libfaad/sbr_dct.c
rename : src/libfaad/sbr_dct.h => contrib/libfaad/sbr_dct.h
rename : src/libfaad/sbr_dec.c => contrib/libfaad/sbr_dec.c
rename : src/libfaad/sbr_dec.h => contrib/libfaad/sbr_dec.h
rename : src/libfaad/sbr_e_nf.c => contrib/libfaad/sbr_e_nf.c
rename : src/libfaad/sbr_e_nf.h => contrib/libfaad/sbr_e_nf.h
rename : src/libfaad/sbr_fbt.c => contrib/libfaad/sbr_fbt.c
rename : src/libfaad/sbr_fbt.h => contrib/libfaad/sbr_fbt.h
rename : src/libfaad/sbr_hfadj.c => contrib/libfaad/sbr_hfadj.c
rename : src/libfaad/sbr_hfadj.h => contrib/libfaad/sbr_hfadj.h
rename : src/libfaad/sbr_hfgen.c => contrib/libfaad/sbr_hfgen.c
rename : src/libfaad/sbr_hfgen.h => contrib/libfaad/sbr_hfgen.h
rename : src/libfaad/sbr_huff.c => contrib/libfaad/sbr_huff.c
rename : src/libfaad/sbr_huff.h => contrib/libfaad/sbr_huff.h
rename : src/libfaad/sbr_noise.h => contrib/libfaad/sbr_noise.h
rename : src/libfaad/sbr_qmf.c => contrib/libfaad/sbr_qmf.c
rename : src/libfaad/sbr_qmf.h => contrib/libfaad/sbr_qmf.h
rename : src/libfaad/sbr_qmf_c.h => contrib/libfaad/sbr_qmf_c.h
rename : src/libfaad/sbr_syntax.c => contrib/libfaad/sbr_syntax.c
rename : src/libfaad/sbr_syntax.h => contrib/libfaad/sbr_syntax.h
rename : src/libfaad/sbr_tf_grid.c => contrib/libfaad/sbr_tf_grid.c
rename : src/libfaad/sbr_tf_grid.h => contrib/libfaad/sbr_tf_grid.h
rename : src/libfaad/sine_win.h => contrib/libfaad/sine_win.h
rename : src/libfaad/specrec.c => contrib/libfaad/specrec.c
rename : src/libfaad/specrec.h => contrib/libfaad/specrec.h
rename : src/libfaad/ssr.c => contrib/libfaad/ssr.c
rename : src/libfaad/ssr.h => contrib/libfaad/ssr.h
rename : src/libfaad/ssr_fb.c => contrib/libfaad/ssr_fb.c
rename : src/libfaad/ssr_fb.h => contrib/libfaad/ssr_fb.h
rename : src/libfaad/ssr_ipqf.c => contrib/libfaad/ssr_ipqf.c
rename : src/libfaad/ssr_ipqf.h => contrib/libfaad/ssr_ipqf.h
rename : src/libfaad/ssr_win.h => contrib/libfaad/ssr_win.h
rename : src/libfaad/structs.h => contrib/libfaad/structs.h
rename : src/libfaad/syntax.c => contrib/libfaad/syntax.c
rename : src/libfaad/syntax.h => contrib/libfaad/syntax.h
rename : src/libfaad/tns.c => contrib/libfaad/tns.c
rename : src/libfaad/tns.h => contrib/libfaad/tns.h
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c

1 files changed, 0 insertions, 357 deletions

diff --git a/src/libfaad/sbr_huff.c b/src/libfaad/sbr_huff.c
deleted file mode 100644
index 39ae32b9b..000000000
--- a/src/libfaad/sbr_huff.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
-**
-** $Id: sbr_huff.c,v 1.7 2005/10/29 23:57:07 tmmm Exp $
-**/
-
-#include "common.h"
-#include "structs.h"
-
-#ifdef SBR_DEC
-
-#include "sbr_syntax.h"
-#include "bits.h"
-#include "sbr_huff.h"
-#include "sbr_e_nf.h"
-
-
-typedef const int8_t (*sbr_huff_tab)[2];
-
-static const int8_t t_huffman_env_1_5dB[120][2] = {
-    {   1,   2 },    { -64, -65 },    {   3,   4 },    { -63, -66 },
-    {   5,   6 },    { -62, -67 },    {   7,   8 },    { -61, -68 },
-    {   9,  10 },    { -60, -69 },    {  11,  12 },    { -59, -70 },
-    {  13,  14 },    { -58, -71 },    {  15,  16 },    { -57, -72 },
-    {  17,  18 },    { -73, -56 },    {  19,  21 },    { -74,  20 },
-    { -55, -75 },    {  22,  26 },    {  23,  24 },    { -54, -76 },
-    { -77,  25 },    { -53, -78 },    {  27,  34 },    {  28,  29 },
-    { -52, -79 },    {  30,  31 },    { -80, -51 },    {  32,  33 },
-    { -83, -82 },    { -81, -50 },    {  35,  57 },    {  36,  40 },
-    {  37,  38 },    { -88, -84 },    { -48,  39 },    { -90, -85 },
-    {  41,  46 },    {  42,  43 },    { -49, -87 },    {  44,  45 },
-    { -89, -86 },    {-124,-123 },    {  47,  50 },    {  48,  49 },
-    {-122,-121 },    {-120,-119 },    {  51,  54 },    {  52,  53 },
-    {-118,-117 },    {-116,-115 },    {  55,  56 },    {-114,-113 },
-    {-112,-111 },    {  58,  89 },    {  59,  74 },    {  60,  67 },
-    {  61,  64 },    {  62,  63 },    {-110,-109 },    {-108,-107 },
-    {  65,  66 },    {-106,-105 },    {-104,-103 },    {  68,  71 },
-    {  69,  70 },    {-102,-101 },    {-100, -99 },    {  72,  73 },
-    { -98, -97 },    { -96, -95 },    {  75,  82 },    {  76,  79 },
-    {  77,  78 },    { -94, -93 },    { -92, -91 },    {  80,  81 },
-    { -47, -46 },    { -45, -44 },    {  83,  86 },    {  84,  85 },
-    { -43, -42 },    { -41, -40 },    {  87,  88 },    { -39, -38 },
-    { -37, -36 },    {  90, 105 },    {  91,  98 },    {  92,  95 },
-    {  93,  94 },    { -35, -34 },    { -33, -32 },    {  96,  97 },
-    { -31, -30 },    { -29, -28 },    {  99, 102 },    { 100, 101 },
-    { -27, -26 },    { -25, -24 },    { 103, 104 },    { -23, -22 },
-    { -21, -20 },    { 106, 113 },    { 107, 110 },    { 108, 109 },
-    { -19, -18 },    { -17, -16 },    { 111, 112 },    { -15, -14 },
-    { -13, -12 },    { 114, 117 },    { 115, 116 },    { -11, -10 },
-    {  -9,  -8 },    { 118, 119 },    {  -7,  -6 },    {  -5,  -4 }
-};
-
-static const int8_t f_huffman_env_1_5dB[120][2] = {
-    {   1,   2 },    { -64, -65 },    {   3,   4 },    { -63, -66 },
-    {   5,   6 },    { -67, -62 },    {   7,   8 },    { -68, -61 },
-    {   9,  10 },    { -69, -60 },    {  11,  13 },    { -70,  12 },
-    { -59, -71 },    {  14,  16 },    { -58,  15 },    { -72, -57 },
-    {  17,  19 },    { -73,  18 },    { -56, -74 },    {  20,  23 },
-    {  21,  22 },    { -55, -75 },    { -54, -53 },    {  24,  27 },
-    {  25,  26 },    { -76, -52 },    { -77, -51 },    {  28,  31 },
-    {  29,  30 },    { -50, -78 },    { -79, -49 },    {  32,  36 },
-    {  33,  34 },    { -48, -47 },    { -80,  35 },    { -81, -82 },
-    {  37,  47 },    {  38,  41 },    {  39,  40 },    { -83, -46 },
-    { -45, -84 },    {  42,  44 },    { -85,  43 },    { -44, -43 },
-    {  45,  46 },    { -88, -87 },    { -86, -90 },    {  48,  66 },
-    {  49,  56 },    {  50,  53 },    {  51,  52 },    { -92, -42 },
-    { -41, -39 },    {  54,  55 },    {-105, -89 },    { -38, -37 },
-    {  57,  60 },    {  58,  59 },    { -94, -91 },    { -40, -36 },
-    {  61,  63 },    { -20,  62 },    {-115,-110 },    {  64,  65 },
-    {-108,-107 },    {-101, -97 },    {  67,  89 },    {  68,  75 },
-    {  69,  72 },    {  70,  71 },    { -95, -93 },    { -34, -27 },
-    {  73,  74 },    { -22, -17 },    { -16,-124 },    {  76,  82 },
-    {  77,  79 },    {-123,  78 },    {-122,-121 },    {  80,  81 },
-    {-120,-119 },    {-118,-117 },    {  83,  86 },    {  84,  85 },
-    {-116,-114 },    {-113,-112 },    {  87,  88 },    {-111,-109 },
-    {-106,-104 },    {  90, 105 },    {  91,  98 },    {  92,  95 },
-    {  93,  94 },    {-103,-102 },    {-100, -99 },    {  96,  97 },
-    { -98, -96 },    { -35, -33 },    {  99, 102 },    { 100, 101 },
-    { -32, -31 },    { -30, -29 },    { 103, 104 },    { -28, -26 },
-    { -25, -24 },    { 106, 113 },    { 107, 110 },    { 108, 109 },
-    { -23, -21 },    { -19, -18 },    { 111, 112 },    { -15, -14 },
-    { -13, -12 },    { 114, 117 },    { 115, 116 },    { -11, -10 },
-    {  -9,  -8 },    { 118, 119 },    {  -7,  -6 },    {  -5,  -4 }
-};
-
-static const int8_t t_huffman_env_bal_1_5dB[48][2] = {
-    { -64,   1 },    { -63,   2 },    { -65,   3 },    { -62,   4 },
-    { -66,   5 },    { -61,   6 },    { -67,   7 },    { -60,   8 },
-    { -68,   9 },    {  10,  11 },    { -69, -59 },    {  12,  13 },
-    { -70, -58 },    {  14,  28 },    {  15,  21 },    {  16,  18 },
-    { -57,  17 },    { -71, -56 },    {  19,  20 },    { -88, -87 },
-    { -86, -85 },    {  22,  25 },    {  23,  24 },    { -84, -83 },
-    { -82, -81 },    {  26,  27 },    { -80, -79 },    { -78, -77 },
-    {  29,  36 },    {  30,  33 },    {  31,  32 },    { -76, -75 },
-    { -74, -73 },    {  34,  35 },    { -72, -55 },    { -54, -53 },
-    {  37,  41 },    {  38,  39 },    { -52, -51 },    { -50,  40 },
-    { -49, -48 },    {  42,  45 },    {  43,  44 },    { -47, -46 },
-    { -45, -44 },    {  46,  47 },    { -43, -42 },    { -41, -40 }
-};
-
-static const int8_t f_huffman_env_bal_1_5dB[48][2] = {
-    { -64,   1 },    { -65,   2 },    { -63,   3 },    { -66,   4 },
-    { -62,   5 },    { -61,   6 },    { -67,   7 },    { -68,   8 },
-    { -60,   9 },    {  10,  11 },    { -69, -59 },    { -70,  12 },
-    { -58,  13 },    {  14,  17 },    { -71,  15 },    { -57,  16 },
-    { -56, -73 },    {  18,  32 },    {  19,  25 },    {  20,  22 },
-    { -72,  21 },    { -88, -87 },    {  23,  24 },    { -86, -85 },
-    { -84, -83 },    {  26,  29 },    {  27,  28 },    { -82, -81 },
-    { -80, -79 },    {  30,  31 },    { -78, -77 },    { -76, -75 },
-    {  33,  40 },    {  34,  37 },    {  35,  36 },    { -74, -55 },
-    { -54, -53 },    {  38,  39 },    { -52, -51 },    { -50, -49 },
-    {  41,  44 },    {  42,  43 },    { -48, -47 },    { -46, -45 },
-    {  45,  46 },    { -44, -43 },    { -42,  47 },    { -41, -40 }
-};
-
-static const int8_t t_huffman_env_3_0dB[62][2] = {
-    { -64,   1 },    { -65,   2 },    { -63,   3 },    { -66,   4 },
-    { -62,   5 },    { -67,   6 },    { -61,   7 },    { -68,   8 },
-    { -60,   9 },    {  10,  11 },    { -69, -59 },    {  12,  14 },
-    { -70,  13 },    { -71, -58 },    {  15,  18 },    {  16,  17 },
-    { -72, -57 },    { -73, -74 },    {  19,  22 },    { -56,  20 },
-    { -55,  21 },    { -54, -77 },    {  23,  31 },    {  24,  25 },
-    { -75, -76 },    {  26,  27 },    { -78, -53 },    {  28,  29 },
-    { -52, -95 },    { -94,  30 },    { -93, -92 },    {  32,  47 },
-    {  33,  40 },    {  34,  37 },    {  35,  36 },    { -91, -90 },
-    { -89, -88 },    {  38,  39 },    { -87, -86 },    { -85, -84 },
-    {  41,  44 },    {  42,  43 },    { -83, -82 },    { -81, -80 },
-    {  45,  46 },    { -79, -51 },    { -50, -49 },    {  48,  55 },
-    {  49,  52 },    {  50,  51 },    { -48, -47 },    { -46, -45 },
-    {  53,  54 },    { -44, -43 },    { -42, -41 },    {  56,  59 },
-    {  57,  58 },    { -40, -39 },    { -38, -37 },    {  60,  61 },
-    { -36, -35 },    { -34, -33 }
-};
-
-static const int8_t f_huffman_env_3_0dB[62][2] = {
-    { -64,   1 },    { -65,   2 },    { -63,   3 },    { -66,   4 },
-    { -62,   5 },    { -67,   6 },    {   7,   8 },    { -61, -68 },
-    {   9,  10 },    { -60, -69 },    {  11,  12 },    { -59, -70 },
-    {  13,  14 },    { -58, -71 },    {  15,  16 },    { -57, -72 },
-    {  17,  19 },    { -56,  18 },    { -55, -73 },    {  20,  24 },
-    {  21,  22 },    { -74, -54 },    { -53,  23 },    { -75, -76 },
-    {  25,  30 },    {  26,  27 },    { -52, -51 },    {  28,  29 },
-    { -77, -79 },    { -50, -49 },    {  31,  39 },    {  32,  35 },
-    {  33,  34 },    { -78, -46 },    { -82, -88 },    {  36,  37 },
-    { -83, -48 },    { -47,  38 },    { -86, -85 },    {  40,  47 },
-    {  41,  44 },    {  42,  43 },    { -80, -44 },    { -43, -42 },
-    {  45,  46 },    { -39, -87 },    { -84, -40 },    {  48,  55 },
-    {  49,  52 },    {  50,  51 },    { -95, -94 },    { -93, -92 },
-    {  53,  54 },    { -91, -90 },    { -89, -81 },    {  56,  59 },
-    {  57,  58 },    { -45, -41 },    { -38, -37 },    {  60,  61 },
-    { -36, -35 },    { -34, -33 }
-};
-
-static const int8_t t_huffman_env_bal_3_0dB[24][2] = {
-    { -64,   1 },    { -63,   2 },    { -65,   3 },    { -66,   4 },
-    { -62,   5 },    { -61,   6 },    { -67,   7 },    { -68,   8 },
-    { -60,   9 },    {  10,  16 },    {  11,  13 },    { -69,  12 },
-    { -76, -75 },    {  14,  15 },    { -74, -73 },    { -72, -71 },
-    {  17,  20 },    {  18,  19 },    { -70, -59 },    { -58, -57 },
-    {  21,  22 },    { -56, -55 },    { -54,  23 },    { -53, -52 }
-};
-
-static const int8_t f_huffman_env_bal_3_0dB[24][2] = {
-    { -64,   1 },    { -65,   2 },    { -63,   3 },    { -66,   4 },
-    { -62,   5 },    { -61,   6 },    { -67,   7 },    { -68,   8 },
-    { -60,   9 },    {  10,  13 },    { -69,  11 },    { -59,  12 },
-    { -58, -76 },    {  14,  17 },    {  15,  16 },    { -75, -74 },
-    { -73, -72 },    {  18,  21 },    {  19,  20 },    { -71, -70 },
-    { -57, -56 },    {  22,  23 },    { -55, -54 },    { -53, -52 }
-};
-
-static const int8_t t_huffman_noise_3_0dB[62][2] = {
-    { -64,   1 },    { -63,   2 },    { -65,   3 },    { -66,   4 },
-    { -62,   5 },    { -67,   6 },    {   7,   8 },    { -61, -68 },
-    {   9,  30 },    {  10,  15 },    { -60,  11 },    { -69,  12 },
-    {  13,  14 },    { -59, -53 },    { -95, -94 },    {  16,  23 },
-    {  17,  20 },    {  18,  19 },    { -93, -92 },    { -91, -90 },
-    {  21,  22 },    { -89, -88 },    { -87, -86 },    {  24,  27 },
-    {  25,  26 },    { -85, -84 },    { -83, -82 },    {  28,  29 },
-    { -81, -80 },    { -79, -78 },    {  31,  46 },    {  32,  39 },
-    {  33,  36 },    {  34,  35 },    { -77, -76 },    { -75, -74 },
-    {  37,  38 },    { -73, -72 },    { -71, -70 },    {  40,  43 },
-    {  41,  42 },    { -58, -57 },    { -56, -55 },    {  44,  45 },
-    { -54, -52 },    { -51, -50 },    {  47,  54 },    {  48,  51 },
-    {  49,  50 },    { -49, -48 },    { -47, -46 },    {  52,  53 },
-    { -45, -44 },    { -43, -42 },    {  55,  58 },    {  56,  57 },
-    { -41, -40 },    { -39, -38 },    {  59,  60 },    { -37, -36 },
-    { -35,  61 },    { -34, -33 }
-};
-
-static const int8_t t_huffman_noise_bal_3_0dB[24][2] = {
-    { -64,   1 },    { -65,   2 },    { -63,   3 },    {   4,   9 },
-    { -66,   5 },    { -62,   6 },    {   7,   8 },    { -76, -75 },
-    { -74, -73 },    {  10,  17 },    {  11,  14 },    {  12,  13 },
-    { -72, -71 },    { -70, -69 },    {  15,  16 },    { -68, -67 },
-    { -61, -60 },    {  18,  21 },    {  19,  20 },    { -59, -58 },
-    { -57, -56 },    {  22,  23 },    { -55, -54 },    { -53, -52 }
-};
-
-
-static INLINE int16_t sbr_huff_dec(bitfile *ld, sbr_huff_tab t_huff)
-{
-    uint8_t bit;
-    int16_t index = 0;
-
-    while (index >= 0)
-    {
-        bit = (uint8_t)faad_get1bit(ld);
-        index = t_huff[index][bit];
-    }
-
-    return index + 64;
-}
-
-/* table 10 */
-void sbr_envelope(bitfile *ld, sbr_info *sbr, uint8_t ch)
-{
-    uint8_t env, band;
-    int8_t delta = 0;
-    sbr_huff_tab t_huff, f_huff;
-
-    if ((sbr->L_E[ch] == 1) && (sbr->bs_frame_class[ch] == FIXFIX))
-        sbr->amp_res[ch] = 0;
-    else
-        sbr->amp_res[ch] = sbr->bs_amp_res;
-
-    if ((sbr->bs_coupling) && (ch == 1))
-    {
-        delta = 1;
-        if (sbr->amp_res[ch])
-        {
-            t_huff = t_huffman_env_bal_3_0dB;
-            f_huff = f_huffman_env_bal_3_0dB;
-        } else {
-            t_huff = t_huffman_env_bal_1_5dB;
-            f_huff = f_huffman_env_bal_1_5dB;
-        }
-    } else {
-        delta = 0;
-        if (sbr->amp_res[ch])
-        {
-            t_huff = t_huffman_env_3_0dB;
-            f_huff = f_huffman_env_3_0dB;
-        } else {
-            t_huff = t_huffman_env_1_5dB;
-            f_huff = f_huffman_env_1_5dB;
-        }
-    }
-
-    for (env = 0; env < sbr->L_E[ch]; env++)
-    {
-        if (sbr->bs_df_env[ch][env] == 0)
-        {
-            if ((sbr->bs_coupling == 1) && (ch == 1))
-            {
-                if (sbr->amp_res[ch])
-                {
-                    sbr->E[ch][0][env] = (uint16_t)(faad_getbits(ld, 5
-                        DEBUGVAR(1,272,"sbr_envelope(): bs_data_env")) << delta);
-                } else {
-                    sbr->E[ch][0][env] = (uint16_t)(faad_getbits(ld, 6
-                        DEBUGVAR(1,273,"sbr_envelope(): bs_data_env")) << delta);
-                }
-            } else {
-                if (sbr->amp_res[ch])
-                {
-                    sbr->E[ch][0][env] = (uint16_t)(faad_getbits(ld, 6
-                        DEBUGVAR(1,274,"sbr_envelope(): bs_data_env")) << delta);
-                } else {
-                    sbr->E[ch][0][env] = (uint16_t)(faad_getbits(ld, 7
-                        DEBUGVAR(1,275,"sbr_envelope(): bs_data_env")) << delta);
-                }
-            }
-
-            for (band = 1; band < sbr->n[sbr->f[ch][env]]; band++)
-            {
-                sbr->E[ch][band][env] = (sbr_huff_dec(ld, f_huff) << delta);
-            }
-
-        } else {
-            for (band = 0; band < sbr->n[sbr->f[ch][env]]; band++)
-            {
-                sbr->E[ch][band][env] = (sbr_huff_dec(ld, t_huff) << delta);
-            }
-        }
-    }
-
-    extract_envelope_data(sbr, ch);
-}
-
-/* table 11 */
-void sbr_noise(bitfile *ld, sbr_info *sbr, uint8_t ch)
-{
-    uint8_t noise, band;
-    int8_t delta = 0;
-    sbr_huff_tab t_huff, f_huff;
-
-    if ((sbr->bs_coupling == 1) && (ch == 1))
-    {
-        delta = 1;
-        t_huff = t_huffman_noise_bal_3_0dB;
-        f_huff = f_huffman_env_bal_3_0dB;
-    } else {
-        delta = 0;
-        t_huff = t_huffman_noise_3_0dB;
-        f_huff = f_huffman_env_3_0dB;
-    }
-
-    for (noise = 0; noise < sbr->L_Q[ch]; noise++)
-    {
-        if(sbr->bs_df_noise[ch][noise] == 0)
-        {
-            if ((sbr->bs_coupling == 1) && (ch == 1))
-            {
-                sbr->Q[ch][0][noise] = (faad_getbits(ld, 5
-                    DEBUGVAR(1,276,"sbr_noise(): bs_data_noise")) << delta);
-            } else {
-                sbr->Q[ch][0][noise] = (faad_getbits(ld, 5
-                    DEBUGVAR(1,277,"sbr_noise(): bs_data_noise")) << delta);
-            }
-            for (band = 1; band < sbr->N_Q; band++)
-            {
-                sbr->Q[ch][band][noise] = (sbr_huff_dec(ld, f_huff) << delta);
-            }
-        } else {
-            for (band = 0; band < sbr->N_Q; band++)
-            {
-                sbr->Q[ch][band][noise] = (sbr_huff_dec(ld, t_huff) << delta);
-            }
-        }
-    }
-
-    extract_noise_floor_data(sbr, ch);
-}
-
-#endif