Port r17543 from Tremor.

[platform/upstream/libvorbis.git] / lib / info.c

diff --git a/lib/info.c b/lib/info.c
index 145da0e..ec24672 100644 (file)
--- a/lib/info.c
+++ b/lib/info.c
@@ -31,8 +31,8 @@
 #include "misc.h"
 #include "os.h"
 
-#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.0pre"
-#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20100303pre (Everywhere)"
+#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.1"
+#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20100325 (Everywhere)"
 
 /* helpers */
 static int ilog2(unsigned int v){
@@ -278,7 +278,7 @@ static int _vorbis_unpack_books(vorbis_info *vi,oggpack_buffer *opb){
   ci->books=oggpack_read(opb,8)+1;
   if(ci->books<=0)goto err_out;
   for(i=0;i<ci->books;i++){
-    ci->book_param[i]=_ogg_calloc(1,sizeof(*ci->book_param[i]));
+    ci->book_param[i]=vorbis_staticbook_unpack(opb);
     if(!ci->book_param[i])goto err_out;
   }