* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_sout.h>
set_callbacks( Open, Close );
add_shortcut( "rtsp" );
add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
- change_safe();
add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
RAWMUX_TEXT, VLC_TRUE );
- change_safe();
add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
THROTLE_LONGTEXT, VLC_TRUE );
- change_safe();
add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
SESSION_TIMEOUT_LONGTEXT, VLC_TRUE );
- change_safe();
vlc_module_end();
/*****************************************************************************
psz_url = config_GetPsz( p_vod, "rtsp-host" );
vlc_UrlParse( &url, psz_url, 0 );
- if( psz_url ) free( psz_url );
+ free( psz_url );
if( url.i_port <= 0 ) url.i_port = 554;
return VLC_SUCCESS;
error:
- if( p_sys && p_sys->p_rtsp_host ) httpd_HostDelete( p_sys->p_rtsp_host );
- if( p_sys && p_sys->psz_raw_mux ) free( p_sys->psz_raw_mux );
- if( p_sys ) free( p_sys );
+ if( p_sys )
+ {
+ if( p_sys->p_rtsp_host ) httpd_HostDelete( p_sys->p_rtsp_host );
+ free( p_sys->psz_raw_mux );
+ free( p_sys );
+ }
vlc_UrlClean( &url );
return VLC_EGENERIC;
TAB_CLEAN( p_media->i_rtsp, p_media->rtsp );
httpd_UrlDelete( p_media->p_rtsp_url );
- if( p_media->psz_rtsp_path ) free( p_media->psz_rtsp_path );
- if( p_media->psz_rtsp_control_v6 ) free( p_media->psz_rtsp_control_v6 );
- if( p_media->psz_rtsp_control_v4 ) free( p_media->psz_rtsp_control_v4 );
+ free( p_media->psz_rtsp_path );
+ free( p_media->psz_rtsp_control_v6 );
+ free( p_media->psz_rtsp_control_v4 );
while( p_media->i_es )
MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
vlc_mutex_destroy( &p_media->lock );
- if( p_media->psz_session_name ) free( p_media->psz_session_name );
- if( p_media->psz_session_description )
- free( p_media->psz_session_description );
- if( p_media->psz_session_url ) free( p_media->psz_session_url );
- if( p_media->psz_session_email ) free( p_media->psz_session_email );
- if( p_media->psz_mux ) free( p_media->psz_mux );
+ free( p_media->psz_session_name );
+ free( p_media->psz_session_description );
+ free( p_media->psz_session_url );
+ free( p_media->psz_session_email );
+ free( p_media->psz_mux );
free( p_media );
}
if( !p_es ) return VLC_ENOMEM;
memset( p_es, 0, sizeof(media_es_t) );
- if( p_media->psz_mux ) free( p_media->psz_mux );
+ free( p_media->psz_mux );
p_media->psz_mux = NULL;
/* TODO: update SDP, etc... */
"sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
p_64_pps ) < 0 )
return VLC_ENOMEM;
- if( p_64_sps )
- free( p_64_sps );
- if( p_64_pps )
- free( p_64_pps );
+ free( p_64_sps );
+ free( p_64_pps );
}
if( !p_es->psz_fmtp )
p_es->psz_fmtp = strdup( "packetization-mode=1" );
TAB_REMOVE( p_media->i_es, p_media->es, p_es );
vlc_mutex_unlock( &p_media->lock );
- if( p_es->psz_rtpmap ) free( p_es->psz_rtpmap );
- if( p_es->psz_fmtp ) free( p_es->psz_fmtp );
+ free( p_es->psz_rtpmap );
+ free( p_es->psz_fmtp );
p_media->i_sdp_version++;
if( p_es->p_rtsp_url ) httpd_UrlDelete( p_es->p_rtsp_url );
next:
vlc_mutex_unlock( &p_sys->lock_media );
- if( cmd.psz_session )
- free( cmd.psz_session );
- if( cmd.psz_arg )
- free( cmd.psz_arg );
+ free( cmd.psz_session );
+ free( cmd.psz_arg );
}
}
while( p_rtsp->i_es-- )
{
- if( p_rtsp->es[p_rtsp->i_es]->psz_ip )
- free( p_rtsp->es[p_rtsp->i_es]->psz_ip );
+ free( p_rtsp->es[p_rtsp->i_es]->psz_ip );
free( p_rtsp->es[p_rtsp->i_es] );
if( !p_rtsp->i_es ) free( p_rtsp->es );
}
if( strstr( psz_transport, "MP2T/H2221/UDP" ) ||
strstr( psz_transport, "RAW/RAW/UDP" ) )
{
- if( p_media->psz_mux ) free( p_media->psz_mux );
+ free( p_media->psz_mux );
p_media->psz_mux = NULL;
p_media->psz_mux = strdup( p_vod->p_sys->psz_raw_mux );
p_media->b_raw = VLC_TRUE;
{
if( p_rtsp->es[i]->p_media_es == p_es )
{
- if( p_rtsp->es[i]->psz_ip ) free( p_rtsp->es[i]->psz_ip );
+ free( p_rtsp->es[i]->psz_ip );
TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, p_rtsp->es[i] );
break;
}