* Enhanced --with-tuning

* Fixed a nasty segfault

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 52241d7238cade30407b2fc8acba3941df58ffb5..c2852e701f83d1e6477f8b46e71524b1c6efff07 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -225,20 +225,25 @@ endif
 endif
 endif
 
-# Optimizations for x86 familiy
-ifneq (,$(findstring 86,$(ARCH)))
-CFLAGS += -mcpu=$(TUNING)
-endif
-
-# Optimizations for PowerPC
 ifneq (,$(findstring powerpc,$(ARCH)))
+# Optimizations for PowerPC
 CFLAGS += -mmultiple -mhard-float -mstring -mcpu=powerpc
+ifneq (,$(TUNING))
 CFLAGS += -mtune=$(TUNING)
 endif
-
-# Optimizations for Sparc
+else
 ifneq (,$(findstring sparc,$(ARCH)))
+# Optimizations for Sparc
 CFLAGS += -mhard-float
+ifneq (,$(TUNING))
+CFLAGS += -mcpu=$(TUNING)
+endif
+else
+# Generic optimizations
+ifneq (,$(TUNING))
+CFLAGS += -mcpu=$(TUNING)
+endif
+endif
 endif
 
 #end of optimisations

diff --git a/plugins/mpeg/input_ps.c b/plugins/mpeg/input_ps.c
index 8b5db02e73f6d2bdbc3e57e75ee4dcef1119e355..d4edd1101b58a823ec3d45f20ea4c23cbd77588a 100644 (file)
--- a/plugins/mpeg/input_ps.c
+++ b/plugins/mpeg/input_ps.c
@@ -2,7 +2,7 @@
  * input_ps.c: PS demux and packet management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.36 2001/10/02 16:46:59 massiot Exp $
+ * $Id: input_ps.c,v 1.37 2001/10/03 14:41:08 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Cyril Deguet <asmax@via.ecp.fr>
@@ -401,7 +401,6 @@ static void PSEnd( input_thread_t * p_input )
 #undef p_packet_cache
 
     free( p_input->p_method_data );
-    free( p_input->p_plugin_data );
 }
 
 /*****************************************************************************