Commit 3adc5bfc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

We only support "rtsp"; do not pretend to support rtspu, rtsps and

whatever else might ever be invented
parent 6dfbbb80
...@@ -312,41 +312,31 @@ static int Open( vlc_object_t *p_this ) ...@@ -312,41 +312,31 @@ static int Open( vlc_object_t *p_this )
for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{ {
if( !strcmp( p_cfg->psz_name, "sdp" ) ) if( !strcmp( p_cfg->psz_name, "sdp" )
{ && ( p_cfg->psz_value != NULL )
if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) ) && !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) )
{ {
b_rtsp = VLC_TRUE; b_rtsp = VLC_TRUE;
break; break;
} }
} }
}
if( !b_rtsp ) if( !b_rtsp )
{ {
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" ); psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
if( psz != NULL ) if( psz != NULL )
{ {
if( !strncasecmp( psz, "rtsp", 4 ) ) if( !strncasecmp( psz, "rtsp:", 5 ) )
b_rtsp = VLC_TRUE; b_rtsp = VLC_TRUE;
free( psz ); free( psz );
} }
} }
if( p_sys->psz_destination == NULL ) if( ( p_sys->psz_destination == NULL ) && !b_rtsp )
{
if( !b_rtsp )
{ {
msg_Err( p_stream, "missing destination and not in RTSP mode" ); msg_Err( p_stream, "missing destination and not in RTSP mode" );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
}
else if( p_sys->i_port <= 0 )
{
msg_Err( p_stream, "invalid port" );
free( p_sys );
return VLC_EGENERIC;
}
p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" ); p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" );
if( p_sys->i_ttl == 0 ) if( p_sys->i_ttl == 0 )
......
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