[vlc-devel] Two SAP bugfixes

[Marian Durkovic]

Hi all,


  we've discovered two problems regarding SAPs:

- sap-parse variable is ignored when sap module is used as demux
- sap is not generated when streaming TS over RTP using rtp streamout

  Please find patches in the attachment.


	With kind regards,

--------------------------------------------------------------------------
----                                                                  ----
----   Marian Durkovic                       network  manager         ----
----                                                                  ----
----   Slovak Technical University           Tel: +421 2 524 51 301   ----
----   Computer Centre, Nam. Slobody 17      Fax: +421 2 524 94 351   ----
----   812 43 Bratislava, Slovak Republic    E-mail/sip: md at bts.sk    ----
----                                                                  ----
--------------------------------------------------------------------------
-------------- next part --------------
--- modules/services_discovery/sap.c		Mon Jul 11 10:53:49 2005
+++ modules/services_discovery/sap.c.mod	Mon Jul 11 11:03:16 2005
@@ -422,7 +422,7 @@
         goto error;
     }
 
-    if( p_sdp->i_media > 1 )
+    if( p_sdp->i_media > 1 || !var_CreateGetInteger( p_demux, "sap-parse" ) )
     {
         goto error;
     }
-------------- next part --------------
--- modules/stream_out/rtp.c		Mon Jul 11 10:54:24 2005
+++ modules/stream_out/rtp.c.mod	Mon Jul 11 11:04:14 2005
@@ -1265,7 +1265,7 @@
     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->psz_sdp && *p_sys->psz_sdp )
     {
         p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp,
                                                      p_method );