[vlc-commits] rtsp: remove now useless handling of full --rtsp-host syntax

[Pierre Ynard]

vlc/vlc-1.2 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sun Dec 18 19:11:32 2011 +0100| [92e7ffc4b0da1676465193ea7724b50a9fed2737] | committer: Pierre Ynard

rtsp: remove now useless handling of full --rtsp-host syntax
(cherry picked from commit feead2df8278a684e64b3ee38f14c0f3a1be394e)

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

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

 modules/misc/rtsp.c      |    7 -------
 modules/stream_out/vod.c |   21 ---------------------
 2 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index d052bfc..d7eaf13 100644
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -270,13 +270,6 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->psz_raw_mux = var_CreateGetString( p_this, "rtsp-raw-mux" );
 
-    var_Create( p_vod, "rtsp-host", VLC_VAR_STRING );
-    var_SetString( p_vod, "rtsp-host", url.psz_host );
-
-    if( url.i_port <= 0 ) url.i_port = 554;
-    var_Create( p_vod, "rtsp-port", VLC_VAR_INTEGER );
-    var_SetInteger( p_vod, "rtsp-port", url.i_port );
-
     p_sys->p_rtsp_host = vlc_rtsp_HostNew( VLC_OBJECT(p_vod) );
     if( !p_sys->p_rtsp_host )
     {
diff --git a/modules/stream_out/vod.c b/modules/stream_out/vod.c
index 61e8bac..dd611d5 100644
--- a/modules/stream_out/vod.c
+++ b/modules/stream_out/vod.c
@@ -146,27 +146,6 @@ int OpenVoD( vlc_object_t *p_this )
         else
             p_sys->psz_rtsp_path = strdup( url.psz_path );
 
-        /* if( url.psz_host != NULL && *url.psz_host )
-        {
-            msg_Err( p_vod, "\"%s\" RTSP host ignored", url.psz_host );
-            msg_Info( p_vod, "Pass --rtsp-host=%s on the command line "
-                      "instead.", url.psz_host );
-        } */
-
-        var_Create( p_vod, "rtsp-host", VLC_VAR_STRING );
-        var_SetString( p_vod, "rtsp-host", url.psz_host );
-
-        /* if( url.i_port != 0 )
-        {
-            msg_Err( p_vod, "\"%u\" RTSP port ignored", url.i_port );
-            msg_Info( p_vod, "Pass --rtsp-port=%u on the command line "
-                      "instead.", url.i_port );
-        } */
-
-        if( url.i_port <= 0 ) url.i_port = 554;
-        var_Create( p_vod, "rtsp-port", VLC_VAR_INTEGER );
-        var_SetInteger( p_vod, "rtsp-port", url.i_port );
-
         vlc_UrlClean( &url );
     }