* video_output/snapshot.c, control/netsync.c: added svn:keywords Id prop.

* control/netsync.c: small fix.

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 3a49c6d6fc21d62e94764fa6af7fa05c318e6726..0eb95dd71b8bee88aef8a902a95e377290d2e26a 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -2,7 +2,7 @@
  * netsync.c: synchronisation between several network clients.\r
  *****************************************************************************\r
  * Copyright (C) 2004 VideoLAN\r
- * $Id: ntservice.c 6963 2004-03-05 19:24:14Z murray $\r
+ * $Id$\r
  *\r
  * Authors: Gildas Bazin <gbazin@videolan.org>\r
  *\r
@@ -113,6 +113,13 @@ static int Activate( vlc_object_t *p_this )
     msg_Info( p_intf, "Using the netsync interface module..." );\r
 \r
     p_intf->p_sys = malloc( sizeof( intf_sys_t ) );\r
+    if( !p_intf->p_sys )\r
+    {\r
+        msg_Err( p_intf, "no memory" );\r
+        return VLC_ENOMEM;\r
+    }\r
+\r
+    p_intf->p_sys->p_input = NULL;\r
 \r
     p_intf->pf_run = Run;\r
     return VLC_SUCCESS;\r
@@ -141,7 +148,7 @@ static void Run( intf_thread_t *p_intf )
     char p_data[MAX_MSG_LENGTH];\r
     int i_socket;\r
 \r
-    if( !psz_master || inet_addr( psz_master ) == INADDR_NONE )\r
+    if( !b_master && (!psz_master || inet_addr( psz_master ) == INADDR_NONE) )\r
     {\r
         if( psz_master ) free( psz_master );\r
         msg_Err( p_intf, "invalid master address." );\r