#include <vlc_vlm.h>
-#ifdef ENABLE_VLM
-
#ifndef WIN32
# include <sys/time.h> /* gettimeofday() */
#endif
p_cfg->psz_name );
if( p_cfg->psz_output )
- asprintf( &psz_output, "%s:description", p_cfg->psz_output );
+ {
+ if( asprintf( &psz_output, "%s:description", p_cfg->psz_output ) == -1 )
+ psz_output = NULL;
+ }
else
- asprintf( &psz_output, "#description" );
+ psz_output = strdup( "#description" );
- asprintf( &psz_dup, "sout=%s", psz_output);
- input_ItemAddOption( p_media->vod.p_item, psz_dup );
- free( psz_dup );
+ if( psz_output && asprintf( &psz_dup, "sout=%s", psz_output) != -1 )
+ {
+ input_ItemAddOption( p_media->vod.p_item, psz_dup );
+ free( psz_output );
+ free( psz_dup );
+ }
for( i = 0; i < p_cfg->i_option; i++ )
input_ItemAddOption( p_media->vod.p_item,
p_cfg->ppsz_option[i] );
input_StopThread( p_input );
vlc_object_release( p_input );
}
- free( psz_output );
free( psz_header );
if( p_cfg->vod.psz_mux )
p_media = malloc( sizeof( vlm_media_sys_t ) );
if( !p_media )
- {
- msg_Err( p_vlm, "out of memory" );
return VLC_ENOMEM;
- }
memset( p_media, 0, sizeof(vlm_media_sys_t) );
if( p_cfg->b_vod )
return i_result;
}
-
-#else /* ENABLE_VLM */
-
-/* We just define an empty wrapper */
-vlm_t *__vlm_New( vlc_object_t *a )
-{
- msg_Err( a, "VideoLAN manager support is disabled" );
- return NULL;
-}
-
-void vlm_Delete( vlm_t *a )
-{
- (void)a;
-}
-
-int vlm_ExecuteCommand( vlm_t *a, const char *b, vlm_message_t **c )
-{
- abort();
-}
-
-vlm_message_t *vlm_MessageNew( const char *psz_name,
- const char *psz_format, ... )
-{
- (void)psz_name; (void)psz_format;
- return NULL;
-}
-
-vlm_message_t *vlm_MessageAdd( vlm_message_t *p_message,
- vlm_message_t *p_child )
-{
- abort();
-}
-
-void vlm_MessageDelete( vlm_message_t *a )
-{
- (void)a;
-}
-
-int vlm_Control( vlm_t *p_vlm, int i_query, ... )
-{
- (void)p_vlm; (void)i_query;
- return VLC_EGENERIC;
-}
-
-#endif /* ENABLE_VLM */