No need to add a '\n' at the end of messages passed to msg_*

[vlc] / modules / services_discovery / sap.c

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index de9a933442c1aa5987bdbbd57a866d5260e98d3f..a7cde36d8d4cd4d238da5aa14250c7e8efe3791c 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -127,20 +127,20 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_PLAYLIST_SD )
 
     add_string( "sap-addr", NULL, NULL,
-                SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true );
+                SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true )
     add_bool( "sap-ipv4", 1 , NULL,
-               SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true );
+               SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true )
     add_bool( "sap-ipv6", 1 , NULL,
-              SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, true );
+              SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, true )
     add_integer( "sap-timeout", 1800, NULL,
-                 SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true );
+                 SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true )
     add_bool( "sap-parse", 1 , NULL,
-               SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, true );
+               SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, true )
     add_bool( "sap-strict", 0 , NULL,
-               SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, true );
+               SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, true )
 #if 0
     add_bool( "sap-cache", 0 , NULL,
-               SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true );
+               SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true )
 #endif
     add_obsolete_bool( "sap-timeshift" ) /* Redumdant since 1.0.0 */
 
@@ -664,7 +664,7 @@ static int Demux( demux_t *p_demux )
         char *rtcp;
         if( asprintf( &rtcp, ":rtcp-port=%u", p_sdp->rtcp_port ) != -1 )
         {
-            input_item_AddOption( p_parent_input, rtcp );
+            input_item_AddOption( p_parent_input, rtcp, VLC_INPUT_OPTION_TRUSTED );
             free( rtcp );
         }
     }
@@ -867,7 +867,7 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
     p_input = input_item_NewWithType( VLC_OBJECT(p_sd),
                                      p_sap->p_sdp->psz_uri,
                                      p_sdp->psz_sessionname,
-                                     0, NULL, -1, ITEM_TYPE_NET );
+                                     0, NULL, 0, -1, ITEM_TYPE_NET );
     p_sap->p_item = p_input;
     if( !p_input )
     {
@@ -880,7 +880,7 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
         char *rtcp;
         if( asprintf( &rtcp, ":rtcp-port=%u", p_sdp->rtcp_port ) != -1 )
         {
-            input_item_AddOption( p_input, rtcp );
+            input_item_AddOption( p_input, rtcp, VLC_INPUT_OPTION_TRUSTED );
             free( rtcp );
         }
     }
@@ -1020,7 +1020,7 @@ static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp )
         return VLC_EGENERIC;
     }
 
-    if (FindAttribute (p_sdp, 0, "rtcp-mux"))
+    if (!strcmp (vlc_proto, "udp") || FindAttribute (p_sdp, 0, "rtcp-mux"))
         p_sdp->rtcp_port = 0;
     else
     {
@@ -1246,7 +1246,7 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp)
                  || ((p_sdp->orig_ip_version != 4)
                   && (p_sdp->orig_ip_version != 6)))
                 {
-                    msg_Dbg (p_obj, "SDP origin not supported: %s\n", data);
+                    msg_Dbg (p_obj, "SDP origin not supported: %s", data);
                     /* Or maybe out-of-range, but this looks suspicious */
                     return NULL;
                 }