Commit 92e7ffc4 authored by Pierre Ynard's avatar Pierre Ynard

rtsp: remove now useless handling of full --rtsp-host syntax

(cherry picked from commit feead2df8278a684e64b3ee38f14c0f3a1be394e)
Signed-off-by: default avatarPierre Ynard <linkfanel@yahoo.fr>
parent f5f58b78
...@@ -270,13 +270,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -270,13 +270,6 @@ static int Open( vlc_object_t *p_this )
p_sys->psz_raw_mux = var_CreateGetString( p_this, "rtsp-raw-mux" ); 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) ); p_sys->p_rtsp_host = vlc_rtsp_HostNew( VLC_OBJECT(p_vod) );
if( !p_sys->p_rtsp_host ) if( !p_sys->p_rtsp_host )
{ {
......
...@@ -146,27 +146,6 @@ int OpenVoD( vlc_object_t *p_this ) ...@@ -146,27 +146,6 @@ int OpenVoD( vlc_object_t *p_this )
else else
p_sys->psz_rtsp_path = strdup( url.psz_path ); 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 ); vlc_UrlClean( &url );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment