Bug 722924 - Fix handling of Vorbis floor0 codebook with no used entries, r=kinetik
authorTimothy B. Terriberry <tterribe@vt.edu>
Mon, 13 Feb 2012 14:05:23 -0800
changeset 86751 01b07f54ec5085368ee00b892eabbcf05a9b8f29
parent 86750 f28f16d674c95fdbe2ecb1f8dcff61ded1dbe404
child 86752 1c7130f50c21ba5ba54d387a86888cae686d5e49
push id22053
push usermak77@bonardo.net
push dateTue, 14 Feb 2012 10:17:02 +0000
treeherdermozilla-central@62695656d7bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs722924
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 722924 - Fix handling of Vorbis floor0 codebook with no used entries, r=kinetik
media/libvorbis/bug722924.patch
media/libvorbis/lib/vorbis_codebook.c
media/libvorbis/update.sh
new file mode 100644
--- /dev/null
+++ b/media/libvorbis/bug722924.patch
@@ -0,0 +1,22 @@
+diff --git a/media/libvorbis/lib/vorbis_codebook.c b/media/libvorbis/lib/vorbis_codebook.c
+--- a/media/libvorbis/lib/vorbis_codebook.c
++++ b/media/libvorbis/lib/vorbis_codebook.c
+@@ -442,17 +442,17 @@ long vorbis_book_decodev_set(codebook *b
+       t     = book->valuelist+entry*book->dim;
+       for (j=0;j<book->dim;)
+         a[i++]=t[j++];
+     }
+   }else{
+     int i,j;
+ 
+     for(i=0;i<n;){
+-      for (j=0;j<book->dim;)
++      for (j=0;j<book->dim;j++)
+         a[i++]=0.f;
+     }
+   }
+   return(0);
+ }
+ 
+ long vorbis_book_decodevv_add(codebook *book,float **a,long offset,int ch,
+                               oggpack_buffer *b,int n){
--- a/media/libvorbis/lib/vorbis_codebook.c
+++ b/media/libvorbis/lib/vorbis_codebook.c
@@ -442,17 +442,17 @@ long vorbis_book_decodev_set(codebook *b
       t     = book->valuelist+entry*book->dim;
       for (j=0;j<book->dim;)
         a[i++]=t[j++];
     }
   }else{
     int i,j;
 
     for(i=0;i<n;){
-      for (j=0;j<book->dim;)
+      for (j=0;j<book->dim;j++)
         a[i++]=0.f;
     }
   }
   return(0);
 }
 
 long vorbis_book_decodevv_add(codebook *book,float **a,long offset,int ch,
                               oggpack_buffer *b,int n){
--- a/media/libvorbis/update.sh
+++ b/media/libvorbis/update.sh
@@ -43,8 +43,9 @@ cp $1/lib/bitrate.c ./lib/vorbis_bitrate
 cp $1/lib/block.c ./lib/vorbis_block.c
 cp $1/include/vorbis/codec.h ./include/vorbis/codec.h
 cp $1/todo.txt ./todo.txt
 cp $1/COPYING ./COPYING
 cp $1/README ./README
 cp $1/AUTHORS ./AUTHORS
 patch -p3 < ./alloca.diff
 patch -p3 < ./bug719612.patch
+patch -p3 < ./bug722924.patch