* Fixed a copy/paste error from previous commit.

diff --git a/configure b/configure
index 9191c9adf5972d7d67f6aeb96ce5d4c5ae6b7d29..815a163dc8162a3e2b93f8f9fc7b94c569677832 100755 (executable)
--- a/configure
+++ b/configure
@@ -6314,7 +6314,6 @@ s%@GPROF@%$GPROF%g
 s%@OPTIMS@%$OPTIMS%g
 s%@TUNING@%$TUNING%g
 s%@RELEASE@%$RELEASE%g
-s%@NEED_GETOPT@%$NEED_GETOPT%g
 s%@MOC@%$MOC%g
 s%@DLL_PATH@%$DLL_PATH%g
 s%@LCFLAGS@%$LCFLAGS%g
@@ -6365,6 +6364,7 @@ s%@CFLAGS_SDL@%$CFLAGS_SDL%g
 s%@CFLAGS_X11@%$CFLAGS_X11%g
 s%@OBJ_DVD@%$OBJ_DVD%g
 s%@OBJ_LIBDVDCSS@%$OBJ_LIBDVDCSS%g
+s%@NEED_GETOPT@%$NEED_GETOPT%g
 s%@NEED_LIBDVDCSS@%$NEED_LIBDVDCSS%g
 
 CEOF

diff --git a/configure.in b/configure.in
index 36ddc813fb3e2b67dcb30533deb1a9fdf6e4989e..3f718bcdb942f1cde4f1c49414054b545abb7eaf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1241,7 +1241,6 @@ AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
 AC_SUBST(TUNING)
 AC_SUBST(RELEASE)
-AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 AC_SUBST(DLL_PATH)
@@ -1298,6 +1297,7 @@ AC_SUBST(CFLAGS_X11)
 AC_SUBST(OBJ_DVD)
 AC_SUBST(OBJ_LIBDVDCSS)
 
+AC_SUBST(NEED_GETOPT)
 AC_SUBST(NEED_LIBDVDCSS)
 
 AC_OUTPUT([Makefile.opts include/config.h])

diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c
index 1085e2d1992c6f53f3e9b7804713515220855bc5..72a571b3389f52aa1d666017d3c0538f331db5ec 100644 (file)
--- a/plugins/sdl/aout_sdl.c
+++ b/plugins/sdl/aout_sdl.c
@@ -2,7 +2,7 @@
  * aout_sdl.c : audio sdl functions library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_sdl.c,v 1.20.2.1 2001/12/18 00:51:19 sam Exp $
+ * $Id: aout_sdl.c,v 1.20.2.2 2001/12/18 02:19:35 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -183,7 +183,8 @@ static int aout_Open( aout_thread_t *p_aout )
 #endif
                 ) < 0 )
     {
-        intf_ErrMsg( "aout error: can't initialize SDL (%s)", SDL_GetError() );+        free( p_aout->p_sys );
+        intf_ErrMsg( "aout error: can't initialize SDL (%s)", SDL_GetError() );
+        free( p_aout->p_sys );
         return( 1 );
     }