oops... last minute fixesSpeex-1.0rc1

git-svn-id: http://svn.xiph.org/trunk/speex@4257 0101bb08-14d6-0310-b084-bc0e0c8e3800

3 files changed, 3 insertions, 3 deletions

diff --git a/libspeex/vbr.c b/libspeex/vbr.c
index e82995c..b035dbc 100644
--- a/libspeex/vbr.c
+++ b/libspeex/vbr.c
@@ -42,7 +42,7 @@
 #define NOISE_POW .3
 
 
-float vbr_nb_thresh[8][11]={
+float vbr_nb_thresh[9][11]={
    {-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0}, /*   CNG   */
    { 3.5,  2.5,  2.0,  1.2,  0.5,  0.0, -0.5, -0.7, -0.8, -0.9, -1.0}, /*  2 kbps */
    {10.0,  6.5,  5.2,  4.5,  3.9,  3.5,  3.0,  2.5,  2.3,  1.8,  1.0}, /*  6 kbps */
diff --git a/libspeex/vbr.h b/libspeex/vbr.h
index d735daf..405b47f 100644
--- a/libspeex/vbr.h
+++ b/libspeex/vbr.h
@@ -38,7 +38,7 @@
 
 #define VBR_MEMORY_SIZE 5
 
-extern float vbr_nb_thresh[8][11];
+extern float vbr_nb_thresh[9][11];
 extern float vbr_hb_thresh[5][11];
 extern float vbr_uhb_thresh[2][11];
 
diff --git a/src/speexdec.c b/src/speexdec.c
index 4793c59..e31eb7b 100644
--- a/src/speexdec.c
+++ b/src/speexdec.c
@@ -282,7 +282,7 @@ static void *process_header(ogg_packet *op, int enh_enabled, int *frame_size, in
       modeID = forceMode;
    mode = speex_mode_list[modeID];
    
-   if (header->speex_version_id != 1)
+   if (header->speex_version_id > 1)
    {
       fprintf (stderr, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", header->speex_version_id);
       return NULL;