Skip to content

V
vlc-2-2
Commit 9020d59c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix TTL in c= line

parent 267cd7f9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
modules/stream_out/standard.c
View file @ 9020d59c
...@@ -345,9 +345,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -345,9 +345,7 @@ static int Open( vlc_object_t *p_this )
p_session->psz_uri = strdup( url.psz_host ); p_session->psz_uri = strdup( url.psz_host );
p_session->i_port = url.i_port; p_session->i_port = url.i_port;
p_session->psz_sdp = NULL; p_session->psz_sdp = NULL;
p_session->i_ttl = var_CreateGetInteger (p_access, "ttl");
var_Get( p_access, "sout-udp-ttl", &val );
p_session->i_ttl = val.i_int;
p_session->i_payload = 33; p_session->i_payload = 33;
p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0; p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;
......
src/stream_output/sap.c
View file @ 9020d59c
...@@ -630,8 +630,7 @@ static char *SDPGenerate( sap_handler_t *p_sap, ...@@ -630,8 +630,7 @@ static char *SDPGenerate( sap_handler_t *p_sap,
i_sdp_id, i_sdp_version, i_sdp_id, i_sdp_version,
ipv, p_addr->psz_machine, ipv, p_addr->psz_machine,
psz_name, ipv, psz_uri, psz_name, ipv, psz_uri,
/* FIXME: 1 is IPv4 default TTL, not that of IPv6 */ (p_session->i_ttl != -1) ? p_session->i_ttl : 255,
p_session->i_ttl ?: (config_GetInt( p_sap, "ttl" ) ?: 1),
ipv, p_addr->psz_machine, ipv, p_addr->psz_machine,
p_session->i_port, p_session->i_port,
p_session->b_rtp ? "RTP/AVP" : "udp", p_session->b_rtp ? "RTP/AVP" : "udp",
......
Markdown is supported
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