[xiph-commits] r13771 - icecast/trunk/ices0/src

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-09-07 12:31:57 -0700 (Fri, 07 Sep 2007)
New Revision: 13771

Modified:
   icecast/trunk/ices0/src/in_vorbis.c
Log:
ov_read() returns long, not int. This fixes issues on 64bit archs with strict
alignment requirements, such as sparc64.

Brendan: Sorry for mucking about your turf without asking. Please feels free
to revert and yell at me.


Modified: icecast/trunk/ices0/src/in_vorbis.c
===================================================================
--- icecast/trunk/ices0/src/in_vorbis.c	2007-09-07 17:37:19 UTC (rev 13770)
+++ icecast/trunk/ices0/src/in_vorbis.c	2007-09-07 19:31:57 UTC (rev 13771)
@@ -44,8 +44,8 @@
 } ices_vorbis_in_t;
 
 /* -- static prototypes -- */
-static int ices_vorbis_readpcm (input_stream_t* self, size_t len,
-				int16_t* left, int16_t* right);
+static long ices_vorbis_readpcm (input_stream_t* self, size_t len,
+				 int16_t* left, int16_t* right);
 static int ices_vorbis_close (input_stream_t* self);
 static void in_vorbis_parse (input_stream_t* self);
 static void in_vorbis_set_metadata (ices_vorbis_in_t* vorbis_data);
@@ -133,13 +133,13 @@
   return 0;
 }
 
-static int
+static long
 ices_vorbis_readpcm (input_stream_t* self, size_t olen, int16_t* left,
 		     int16_t* right)
 {
   ices_vorbis_in_t* vorbis_data = (ices_vorbis_in_t*) self->data;
   int link;
-  int len;
+  long len;
   int i;
 
   /* refill buffer if necessary */