Use var_InheritString for --decklink-video-connection.

[vlc] / modules / control / netsync.c

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 3b905639e59d21e4c36c1581f281357566ff20e3..2f9e778f13e878c0c1a60747a04ac2625e9be7ca 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * netsync.c: synchronisation between several network clients.
+ * netsync.c: synchronization between several network clients.
  *****************************************************************************
  * Copyright (C) 2004-2009 the VideoLAN team
  * $Id$
@@ -56,20 +56,20 @@ static void Close(vlc_object_t *);
 
 #define NETSYNC_TEXT N_("Network master clock")
 #define NETSYNC_LONGTEXT N_("When set then " \
-  "this vlc instance shall dictate its clock for synchronisation" \
+  "This VLC instance shall dictate its clock for synchronization " \
   "over clients listening on the masters network ip address")
 
 #define MIP_TEXT N_("Master server ip address")
 #define MIP_LONGTEXT N_("The IP address of " \
-  "the network master clock to use for clock synchronisation.")
+  "The network master clock to use for clock synchronization.")
 
 #define NETSYNC_TIMEOUT_TEXT N_("UDP timeout (in ms)")
-#define NETSYNC_TIMEOUT_LONGTEXT N_("Amount of time (in ms) " \
-  "to wait before aborting network reception of data.")
+#define NETSYNC_TIMEOUT_LONGTEXT N_("Length of time (in ms) " \
+  "until aborting data reception.")
 
 vlc_module_begin()
     set_shortname(N_("Network Sync"))
-    set_description(N_("Network synchronisation"))
+    set_description(N_("Network synchronization"))
     set_category(CAT_ADVANCED)
     set_subcategory(SUBCAT_ADVANCED_MISC)
 
@@ -208,7 +208,6 @@ static void *Master(void *handle)
                  (from.ss_family == AF_INET) ? inet_ntoa(((struct sockaddr_in *)&from)->sin_addr)
                  : "non-IPv4", /*date*/ 0);
 #endif
-    return NULL;
     }
 }
 
@@ -269,7 +268,6 @@ static void *Slave(void *handle)
     wait:
         msleep(INTF_IDLE_SLEEP);
     }
-    return NULL;
 }
 
 static int InputEvent(vlc_object_t *object, char const *cmd,