* forgot to add the declaration of server_port in main.c

* char pointers obtained by config_GetPszVariable need to be freed

diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c
index c8f2d21c0c2023bf57cd084cac1c5ad4146287aa..8c41bca88ef81be17038f847a3a75b787520e248 100644 (file)
--- a/src/audio_output/audio_output.c
+++ b/src/audio_output/audio_output.c
@@ -2,7 +2,7 @@
  * audio_output.c : audio output thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: audio_output.c,v 1.78 2002/02/24 22:06:50 sam Exp $
+ * $Id: audio_output.c,v 1.79 2002/02/26 18:25:40 gbazin Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Cyril Deguet <asmax@via.ecp.fr>
@@ -86,6 +86,7 @@ aout_thread_t *aout_CreateThread( int *pi_status, int i_channels, int i_rate )
 #if 0
     int             i_status;                               /* thread status */
 #endif
+    char *psz_name;
 
     /* Allocate descriptor */
     p_aout = (aout_thread_t *) malloc( sizeof(aout_thread_t) );
@@ -117,10 +118,10 @@ aout_thread_t *aout_CreateThread( int *pi_status, int i_channels, int i_rate )
     }
 
     /* Choose the best module */
-    p_aout->p_module = module_Need( MODULE_CAPABILITY_AOUT,
-                           config_GetPszVariable( AOUT_METHOD_VAR ), 
-                           (void *)p_aout );
-
+    psz_name = config_GetPszVariable( AOUT_METHOD_VAR );
+    p_aout->p_module = module_Need( MODULE_CAPABILITY_AOUT, psz_name,
+                                    (void *)p_aout );
+    if( psz_name ) free( psz_name );
     if( p_aout->p_module == NULL )
     {
         intf_ErrMsg( "aout error: no suitable aout module" );

diff --git a/src/interface/main.c b/src/interface/main.c
index d6f89f37bc37ed012351439cdbe8146e0993f9cd..12f3302fe4f9864c31ebd81d829992f060107d5a 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.155 2002/02/26 01:17:13 stef Exp $
+ * $Id: main.c,v 1.156 2002/02/26 18:25:40 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -155,6 +155,7 @@ ADD_INTEGER ( VOUT_SPUMARGIN_VAR, -1, NULL, "force SPU position", NULL )
 /* Input options */
 ADD_CATEGORY_HINT( "Input Options", NULL )
 ADD_STRING  ( INPUT_METHOD_VAR, NULL, NULL, "input method", NULL )
+ADD_INTEGER ( INPUT_PORT_VAR, 1234, NULL, "server port", NULL )
 ADD_BOOL    ( INPUT_NETWORK_CHANNEL_VAR, NULL, "enable network channel mode",
               NULL )
 ADD_STRING  ( INPUT_CHANNEL_SERVER_VAR, "localhost", NULL,