* Fix the two SAP issues reported by Marian Durkovic.

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 7b85e093d599e7e1b41e664fc4376e3277ef4c62..2bb084d5edbfbb6788fe942c8c5141fadd062174 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -372,6 +372,12 @@ static int OpenDemux( vlc_object_t *p_this )
     char *psz_sdp = NULL;
     sdp_t *p_sdp = NULL;
 
+    if( !var_CreateGetInteger( p_demux, "sap-parse" ) )
+    {
+        /* We want livedotcom module to parse this SDP file */
+        return VLC_EGENERIC;
+    }
+
     /* Probe for SDP */
     if( p_demux->s )
     {

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 30d06dc4aa8717e41ab85cfcae656a158549861d..c75381d87390f9286c8dfff53ce286511c53b790 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1283,7 +1283,7 @@ static int SapSetup( sout_stream_t *p_stream )
     p_method->i_type = METHOD_TYPE_SAP;
     p_method->psz_address = NULL; /* FIXME */
 
-    if( p_sys->i_es > 0 && p_sys->psz_sdp && *p_sys->psz_sdp )
+    if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
     {
         p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp,
                                                      p_method );