Patched to compile.

icculus · Jun 14, 2004 · 9350e36 · 9350e36
1 parent c6ddced
commit 9350e36
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/osx/AL_EXT_vorbis/libvorbis-1.0-optimized/lib/mapping0.c b/osx/AL_EXT_vorbis/libvorbis-1.0-optimized/lib/mapping0.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.2 2003/10/20 03:26:15 icculus Exp $
+ last mod: $Id: mapping0.c,v 1.3 2004/06/14 17:03:42 icculus Exp $
 
  ********************************************************************/
 
@@ -508,8 +508,8 @@ static int mapping0_forward(vorbis_block *vb){
     float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
     int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
     int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
-    float **mag_memo;
-    int **mag_sort;
+    float **mag_memo = NULL;
+    int **mag_sort = NULL;
 
     if(info->coupling_steps){
       mag_memo=_vp_quantize_couple_memo(vb,

diff --git a/osx/AL_EXT_vorbis/libvorbis-1.0-optimized/lib/psy.c b/osx/AL_EXT_vorbis/libvorbis-1.0-optimized/lib/psy.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.1 2003/10/12 23:51:40 root Exp $
+ last mod: $Id: psy.c,v 1.2 2004/06/14 17:03:42 icculus Exp $
 
  ********************************************************************/
 
@@ -546,8 +546,8 @@ static void bark_noise_hybridmp(int n,const long *b,
   float fi;
   int i;
 
-  int lo, hi;
-  float R, A, B, D;
+  int lo = 0, hi = 0;
+  float R = 0.0f, A = 0.0f, B = 0.0f, D = 0.0f;
 
   tN = tX = tXX = tY = tXY = 0.f;
   for (i = 0, fi = 0.f; i < n; i++, fi += 1.f) {

diff --git a/osx/AL_EXT_vorbis/libvorbis-1.0-optimized/lib/vorbisfile.c b/osx/AL_EXT_vorbis/libvorbis-1.0-optimized/lib/vorbisfile.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.c,v 1.2 2004/01/27 18:39:13 icculus Exp $
+ last mod: $Id: vorbisfile.c,v 1.3 2004/06/14 17:03:42 icculus Exp $
 
  ********************************************************************/
 
@@ -933,8 +933,8 @@ int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos){
     ogg_packet op;
     int lastblock=0;
     int accblock=0;
-    int thisblock;
-    int eosflag;
+    int thisblock=0;
+    int eosflag = 0;
 
     ogg_stream_init(&work_os,-1); /* get the memory ready */
 

diff --git a/osx/makefile b/osx/makefile
@@ -29,7 +29,7 @@
 # If you don't already know what the various SUPPORT_* things do,
 #  leave them alone.
 
-OPTIMIZE := false
+OPTIMIZE := true
 USE_G4_OPCODES := false
 USE_G5_OPCODES := false
 USE_CCACHE := true
@@ -69,7 +69,7 @@ else
   COMPILERFLAGS := -Wall -Werror -faltivec -fasm -force_cpusubtype_ALL -fsigned-chars -fPIC
   ifeq ($(strip $(OPTIMIZE)),true)
     OPTIMIZATIONS := -O3 -D_NDEBUG=1 -falign-loops=16 -ffast-math -fexpensive-optimizations -fno-common -fno-math-errno
-    ifeq ($(strip $(USE_G5_OPCODES),true)
+    ifeq ($(strip $(USE_G5_OPCODES)),true)
       OPTIMIZATIONS += -mpowerpc-gpopt -mpowerpc64 -mcpu=970 -march=970 -DFORCE_STD_SQRT=1
     endif
   else