Commit 8a67cac4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Use RTP sout for RTP

parent 7440827a
......@@ -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);
......
......@@ -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 );
}
......
......@@ -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."),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment