[vlc-commits] live555: Drop satip support

[Julian Scheel]

vlc | branch: master | Julian Scheel <julian at jusst.de> | Thu Jul  7 17:07:26 2016 +0200| [af81fd8fb63d5455f1d2aaf8a4b841eebe2a38d9] | committer: Thomas Guillem

live555: Drop satip support

The satip shortcut is provided by the dedicated satip access module now.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=af81fd8fb63d5455f1d2aaf8a4b841eebe2a38d9
---

 modules/access/live555.cpp |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 4a048af..690e585 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -103,7 +103,7 @@ vlc_module_begin ()
 
     add_submodule ()
         set_description( N_("RTSP/RTP access and demux") )
-        add_shortcut( "rtsp", "pnm", "live", "livedotcom", "satip" )
+        add_shortcut( "rtsp", "pnm", "live", "livedotcom" )
         set_capability( "access_demux", 0 )
         set_callbacks( Open, Close )
         add_bool( "rtsp-tcp", false,
@@ -337,18 +337,6 @@ static int  Open ( vlc_object_t *p_this )
         while( (p = strchr( p, ' ' )) != NULL ) *p = '+';
     }
 
-    if( strcasecmp( p_demux->psz_access, "satip" ) == 0 )
-    {
-        if( asprintf(&p_sys->p_sdp, "v=0\r\n"
-                     "o=- 0 %s\r\n"
-                     "s=SATIP:stream\r\n"
-                     "i=SATIP RTP Stream\r\n"
-                     "m=video 0 RTP/AVP 33\r\n"
-                     "a=control:rtsp://%s\r\n\r\n",
-                     p_sys->url.psz_host, p_sys->psz_path) < 0 )
-            abort();
-    }
-
     if( p_demux->s != NULL )
     {
         /* Gather the complete sdp file */