Avoid a segfault when services_discovery_GetServicesNames fail.

[vlc] / modules / gui / wxwidgets / streamdata.cpp

diff --git a/modules/gui/wxwidgets/streamdata.cpp b/modules/gui/wxwidgets/streamdata.cpp
index ee18f7d402ec2af1269578567c52f51330180a24..6ae906fc4dd805c35717abf206fe88e301ac603c 100644 (file)
--- a/modules/gui/wxwidgets/streamdata.cpp
+++ b/modules/gui/wxwidgets/streamdata.cpp
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <wx/string.h>
 #include "streamdata.h"
@@ -72,7 +76,7 @@ const struct codec vcodecs_array[] =
        {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , -1 , -1,-1,-1,-1 } },
     { "Theora" , "theo", N_("Theora is a free general-purpose codec (useable " \
         "with MPEG TS)"),
-       {MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1} },
+       {MUX_TS, MUX_OGG,-1,-1,-1,-1,-1,-1,-1} },
     { "Dummy", "dummy", N_("Dummy codec (do not transcode, useable with all " \
         "encapsulation formats)") ,
       {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_MP4,MUX_OGG,MUX_WAV,MUX_RAW,MUX_MOV}},
@@ -119,19 +123,19 @@ const struct codec acodecs_array[] =
 
 const struct method methods_array[] =
 {
-    {"rtp",N_("RTP Unicast"), N_("Use this to stream to a single computer."),
+    {"rtp{",N_("RTP Unicast"), N_("Stream to a single computer."),
      N_("Enter the address of the computer to stream to."),
      { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
-    {"rtp",N_("RTP Multicast"),
-     N_("Use this to stream to a dynamic group of computers on a "
+    {"rtp{",N_("RTP Multicast"),
+     N_("Stream to a dynamic group of computers on a "
      "multicast-enabled network. This is the most efficient method "
-     "to stream to several computers, but it does not work over Internet."),
-     N_("Enter the multicast address to stream to in this field. "
+     "to stream to several computers, but it does not work over the Internet."),
+     N_("Enter the multicast address to stream to. "
      "This must be an IP address between 224.0.0.0 an 239.255.255.255. "
-     "For a private use, enter an address beginning with 239.255."),
+     "For private use, enter an address beginning with 239.255."),
      { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
-    {"http","HTTP",
-     N_("Use this to stream to several computers. This method is "
+    {"std{access=http,","HTTP",
+     N_("Stream to several computers. This method is "
      "less efficient, as the server needs to send the "
      "stream several times."),
      N_("Enter the local addresses you want to listen to. Do not enter "