From 752b854eaa7dc3302cc20fcb6b28476adfaa12de Mon Sep 17 00:00:00 2001
From: Christophe Massiot <massiot@videolan.org>
Date: Fri, 28 Sep 2001 15:08:40 +0000
Subject: [PATCH] Fixed bugs in the MacOS X port.

---
 Makefile.opts.in           | 6 +++---
 plugins/idct/idctaltivec.c | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.opts.in b/Makefile.opts.in
index f7bb553659..ff60ce25f5 100644
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -188,7 +188,7 @@ ifneq (,$(findstring mingw32,$(SYS)))
 LIB += -lws2_32 -lnetapi32
 endif
 
-LIB += -L/usr/local/lib @LIB@
+LIB += @LIB@
 
 #
 # C compiler flags: mainstream compilation
@@ -266,7 +266,7 @@ LCFLAGS += -Wall
 ifneq ($(DEBUG),1)
 ifneq ($(GPROF),1)
 ifneq ($(CPROF),1)
-LCFLAGS += -s
+#LCFLAGS += -s
 endif
 endif
 endif
@@ -277,7 +277,7 @@ endif
 #
 # C compiler and linker flags: setting soname
 #
-SOFLAGS += @SOFLAGS@
+SOFLAGS = @SOFLAGS@
 
 #
 # C compiler flags: plugin compilation
diff --git a/plugins/idct/idctaltivec.c b/plugins/idct/idctaltivec.c
index 7499a9eb12..caec7a2b61 100644
--- a/plugins/idct/idctaltivec.c
+++ b/plugins/idct/idctaltivec.c
@@ -2,7 +2,7 @@
  * idctaltivec.c : Altivec IDCT module
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idctaltivec.c,v 1.17 2001/09/28 14:17:16 massiot Exp $
+ * $Id: idctaltivec.c,v 1.18 2001/09/28 15:08:40 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -121,6 +121,8 @@ static void InitIDCT( void ** pp_idct_data )
  * IDCT in Altivec
  *****************************************************************************/
 
+#ifndef HAVE_C_ALTIVEC
+
 static int16_t constants[5][8] ATTR_ALIGN(16) = {
     {23170, 13573, 6518, 21895, -23170, -21895, 32, 31},
     {16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725},
@@ -129,8 +131,6 @@ static int16_t constants[5][8] ATTR_ALIGN(16) = {
     {19266, 26722, 25172, 22654, 19266, 22654, 25172, 26722}
 };
 
-#ifndef HAVE_C_ALTIVEC
-
 /*
  * The asm code is generated with:
  *
@@ -673,7 +673,7 @@ void idct_block_add_altivec (int16_t * block, uint8_t * dest, int stride)
     vx6 = vec_sra (vy6, shift);						\
     vx7 = vec_sra (vy7, shift);
 
-static vector_s16_t constants[5] = {
+static vector_s16_t constants[5] ATTR_ALIGN(16) = {
     (vector_s16_t)(23170, 13573, 6518, 21895, -23170, -21895, 32, 31),
     (vector_s16_t)(16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725),
     (vector_s16_t)(22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521),