[xiph-commits] r17373 - branches/lowmem-no-byte/Tremor

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-08-31 11:37:07 -0700 (Tue, 31 Aug 2010)
New Revision: 17373

Modified:
   branches/lowmem-no-byte/Tremor/vorbisfile.c
Log:
Sync up with lowmem-branch's vorbisfile implementation.


Modified: branches/lowmem-no-byte/Tremor/vorbisfile.c
===================================================================
--- branches/lowmem-no-byte/Tremor/vorbisfile.c	2010-08-28 18:32:12 UTC (rev 17372)
+++ branches/lowmem-no-byte/Tremor/vorbisfile.c	2010-08-31 18:37:07 UTC (rev 17373)
@@ -69,7 +69,7 @@
 static long _get_data(OggVorbis_File *vf){
   errno=0;
   if(vf->datasource){
-    char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
+    unsigned char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
     long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource);
     if(bytes>0)ogg_sync_wrote(vf->oy,bytes);
     if(bytes==0 && errno)return -1;
@@ -716,7 +716,7 @@
      previously read data (as we may be reading from a non-seekable
      stream) */
   if(initial){
-    char *buffer=ogg_sync_bufferin(vf->oy,ibytes);
+    unsigned char *buffer=ogg_sync_bufferin(vf->oy,ibytes);
     memcpy(buffer,initial,ibytes);
     ogg_sync_wrote(vf->oy,ibytes);
   }
@@ -1476,7 +1476,7 @@
 
 /* return time offset (milliseconds) of next PCM sample to be read */
 ogg_int64_t ov_time_tell(OggVorbis_File *vf){
-  int link=0,ret;
+  int link=0;
   ogg_int64_t pcm_total=0;
   ogg_int64_t time_total=0;
   
@@ -1555,7 +1555,6 @@
 	    *section) set to the logical bitstream number */
 
 long ov_read(OggVorbis_File *vf,void *buffer,int bytes_req,int *bitstream){
-  int i,j;
 
   long samples;
   long channels;