Fix TTL in c= line

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index ab569a6e200c01737803809999a06a556cff94f3..2717b006e8bcbed635ac19880b94eaa7238fe680 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -345,9 +345,7 @@ static int Open( vlc_object_t *p_this )
             p_session->psz_uri = strdup( url.psz_host );
             p_session->i_port = url.i_port;
             p_session->psz_sdp = NULL;
-
-            var_Get( p_access, "sout-udp-ttl", &val );
-            p_session->i_ttl = val.i_int;
+            p_session->i_ttl = var_CreateGetInteger (p_access, "ttl");
             p_session->i_payload = 33;
             p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;
 

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 926326bae59ecefcfd738d519c7c3effe828ff2c..99663d26637556eea4ea4550291a6098d476bf25 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -630,8 +630,7 @@ static char *SDPGenerate( sap_handler_t *p_sap,
                             i_sdp_id, i_sdp_version,
                             ipv, p_addr->psz_machine,
                             psz_name, ipv, psz_uri,
-                            /* FIXME: 1 is IPv4 default TTL, not that of IPv6 */
-                            p_session->i_ttl ?: (config_GetInt( p_sap, "ttl" ) ?: 1),
+                            (p_session->i_ttl != -1) ? p_session->i_ttl : 255,
                             ipv, p_addr->psz_machine,
                             p_session->i_port, 
                             p_session->b_rtp ? "RTP/AVP" : "udp",