From: Rémi Denis-Courmont <rem@videolan.org>
Date: Fri, 9 Feb 2007 19:35:29 +0000 (+0000)
Subject: Remove use SAP/TTL cruft
X-Git-Tag: 0.9.0-test0~8680
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dffddfaee31588be913bd77b0077c8eadcbceafb;p=vlc

Remove use SAP/TTL cruft
---

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index b9192b8a3e..839861c922 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -216,7 +216,6 @@ struct session_descriptor_t
     char *psz_name;
     char *psz_uri;
     int i_port;
-    int i_ttl;
     int i_payload;   /* SAP Payload type */
 
     char *psz_group;
diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index c928881260..51e718b782 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -345,7 +345,6 @@ 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;
-            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 48b737fef6..8617f7fa7e 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -632,12 +632,11 @@ static char *SDPGenerate( sap_handler_t *p_sap,
             return NULL;
     }
 
-    /* see the lists in modules/stream_out/rtp.c for compliance stuff */
     int res = asprintf (&psz_sdp,
                         "v=0\r\n"
                         "o=- "I64Fd" %d IN IP%c %s\r\n"
                         "s=%s\r\n"
-                        "c=IN IP%c %s/%d\r\n"
+                        "c=IN IP%c %s/255\r\n"
                         "t=0 0\r\n"
                         "a=tool:"PACKAGE_STRING"\r\n"
                         "a=recvonly\r\n"
@@ -648,7 +647,6 @@ static char *SDPGenerate( sap_handler_t *p_sap,
                         i_sdp_id, i_sdp_version,
                         ipv, p_addr->psz_machine,
                         psz_name, ipv, psz_uri,
-                        (p_session->i_ttl != -1) ? p_session->i_ttl : 255,
                         (sfilter != NULL) ? sfilter : "",
                         p_session->i_port,
                         p_session->b_rtp ? "RTP/AVP" : "udp",