Use RTP sout for RTP

diff --git a/modules/gui/wxwidgets/dialogs/streamout.cpp b/modules/gui/wxwidgets/dialogs/streamout.cpp
index 97bf1ac266272adba3b8d125b0a5b7a85f61a8b2..044b74321bc4036f29f5da94a0a984a84dcbbff5 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/streamout.cpp
+++ b/modules/gui/wxwidgets/dialogs/streamout.cpp
@@ -357,7 +357,7 @@ void SoutDialog::UpdateMRL()
     if( access_checkboxes[RTP_ACCESS_OUT]->IsChecked() )
     {
         if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
-        dup_opts += wxT("dst=std{access=rtp,mux=");
+        dup_opts += wxT("dst=rtp{mux=");
         dup_opts += encapsulation + wxT(",dst=");
 
         wxString rtp_addr = net_addrs[RTP_ACCESS_OUT]->GetLineText(0);

diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp
index 91d8a172bb12ab58b8f71156d0828d94b1e1167a..89b0c3842d4590fdbdebbc6bffba42e367a2b681 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/wizard.cpp
+++ b/modules/gui/wxwidgets/dialogs/wizard.cpp
@@ -1611,8 +1611,8 @@ void WizardDialog::Run()
             /* Add brackets automatically for IPv6 if they are missing */
             v6 = ( address[0] != '[' ) && ( strchr( address, ':' ) != NULL );
             asprintf( &psz_opt,
-                      ":sout=#standard{mux=%s,dst=%s%s%s,access=%s%s}",
-                      mux, v6 ? "[" : "", address, v6 ? "]" : "", method,
+                      ":sout=#%smux=%s,dst=%s%s%s%s}", method,
+                      mux, v6 ? "[" : "", address, v6 ? "]" : "",
                       psz_sap_option ?: "" );
             if( psz_sap_option ) free( psz_sap_option );
         }

diff --git a/modules/gui/wxwidgets/streamdata.cpp b/modules/gui/wxwidgets/streamdata.cpp
index f523f3fb45b70851a634a2c5737df11521d81711..e780572930a0cd7e3fd6434d82db0ad21606a381 100644 (file)
--- a/modules/gui/wxwidgets/streamdata.cpp
+++ b/modules/gui/wxwidgets/streamdata.cpp
@@ -119,10 +119,10 @@ const struct codec acodecs_array[] =
 
 const struct method methods_array[] =
 {
-    {"rtp",N_("RTP Unicast"), N_("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"),
+    {"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 the Internet."),
@@ -130,7 +130,7 @@ const struct method methods_array[] =
      "This must be an IP address between 224.0.0.0 an 239.255.255.255. "
      "For private use, enter an address beginning with 239.255."),
      { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
-    {"http","HTTP",
+    {"std{access=http,","HTTP",
      N_("Stream to several computers. This method is "
      "less efficient, as the server needs to send the "
      "stream several times."),