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 )
{
p_sys->psz_path, psz_name ) <0 )
return NULL;
p_media->p_rtsp_url =
- httpd_UrlNewUnique( p_sys->p_rtsp_host, p_media->psz_rtsp_path, NULL,
- NULL, NULL );
+ httpd_UrlNew( p_sys->p_rtsp_host, p_media->psz_rtsp_path, NULL, NULL );
if( !p_media->p_rtsp_url )
{
}
p_es->p_rtsp_url =
- httpd_UrlNewUnique( p_vod->p_sys->p_rtsp_host, psz_urlc, NULL, NULL,
- NULL );
+ httpd_UrlNew( p_vod->p_sys->p_rtsp_host, psz_urlc, NULL, NULL );
if( !p_es->p_rtsp_url )
{
if( psz_arg )
cmd.psz_arg = strdup(psz_arg);
- p_cmd = block_New( p_vod, sizeof(rtsp_cmd_t) );
+ p_cmd = block_Alloc( sizeof(rtsp_cmd_t) );
memcpy( p_cmd->p_buffer, &cmd, sizeof(cmd) );
block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd );
for( int i = 0; i < p_rtsp->i_es; i++ )
{
- if( p_rtsp->es[i]->p_media_es == p_es )
+ rtsp_client_es_t *es = p_rtsp->es[i];
+ if( es->p_media_es == p_es )
{
- TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, p_rtsp->es[i] );
+ TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, es );
break;
}
}