- Add aggregate control URL

- Fix non-aggregate control URL

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 628ab1da35833a7cf9435ebc144dc78608f8ca71..f0828600b8e3d5095adba91817dadc9c87c1ac5a 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -693,8 +693,12 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url )
     if( psz_sdp == NULL )
         return NULL;
 
+
     /* TODO: a=source-filter */
 
+    if( rtsp_url != NULL )
+        sdp_AddAttribute ( &psz_sdp, "control", "%s", rtsp_url );
+
     /* FIXME: locking?! */
     for( i = 0; i < p_sys->i_es; i++ )
     {
@@ -721,7 +725,8 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url )
                       id->psz_rtpmap, id->psz_fmtp);
 
         if( rtsp_url != NULL )
-            sdp_AddAttribute ( &psz_sdp, "control", "/trackID=%d", i );
+            sdp_AddAttribute ( &psz_sdp, "control", "%s/trackID=%d",
+                               rtsp_url, i );
     }
 
     return psz_sdp;