diff -r 78a00bc68913 -r 767d3c4153a1 misc/libtremor/tremor/ivorbisfile.h
--- a/misc/libtremor/tremor/ivorbisfile.h	Thu Sep 20 23:04:10 2012 +0200
+++ b/misc/libtremor/tremor/ivorbisfile.h	Fri Sep 21 00:50:04 2012 +0200
@@ -6,7 +6,7 @@
  * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002    *
+ * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003    *
  * BY THE Xiph.Org FOUNDATION http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include "ivorbiscodec.h"
 
-#define CHUNKSIZE 1024
 /* The function prototypes for the callbacks are basically the same as for
  * the stdio functions fread, fseek, fclose, ftell. 
  * The one difference is that the FILE * arguments have been replaced with
@@ -44,12 +43,6 @@
   long   (*tell_func)  (void *datasource);
 } ov_callbacks;
 
-#define  NOTOPEN   0
-#define  PARTOPEN  1
-#define  OPENED    2
-#define  STREAMSET 3
-#define  INITSET   4
-
 typedef struct OggVorbis_File {
   void            *datasource; /* Pointer to a FILE *, etc. */
   int              seekable;
@@ -64,8 +57,8 @@
   ogg_int64_t     *dataoffsets;
   ogg_uint32_t    *serialnos;
   ogg_int64_t     *pcmlengths;
-  vorbis_info     *vi;
-  vorbis_comment  *vc;
+  vorbis_info     vi;
+  vorbis_comment  vc;
 
   /* Decoding working state local storage */
   ogg_int64_t      pcm_offset;
@@ -78,8 +71,7 @@
 
   ogg_stream_state *os; /* take physical pages, weld into a logical
                           stream of packets */
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
+  vorbis_dsp_state *vd; /* central working state for the packet->PCM decoder */
 
   ov_callbacks callbacks;
 
@@ -118,7 +110,7 @@
 extern vorbis_info *ov_info(OggVorbis_File *vf,int link);
 extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link);
 
-extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
+extern long ov_read(OggVorbis_File *vf,void *buffer,int length,
 		    int *bitstream);
 
 #ifdef __cplusplus