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

playlist: remove dead code and malloc(0)

parent 9b65068e
......@@ -41,10 +41,6 @@
#include "playlist.h"
struct demux_sys_t
{
};
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......@@ -158,23 +154,14 @@ int Import_ASX( vlc_object_t *p_this )
) ||
demux_IsForced( p_demux, "asx-open" ) )
{
STANDARD_DEMUX_INIT_MSG( "found valid ASX playlist" );
return VLC_SUCCESS;
msg_Dbg( p_demux, "found valid ASX playlist" );
}
else
return VLC_EGENERIC;
}
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
void Close_ASX( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
free( p_sys );
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
return VLC_SUCCESS;
}
static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
......
......@@ -109,7 +109,7 @@ vlc_module_begin ()
set_description( N_("ASX playlist import") )
add_shortcut( "playlist", "asx-open" )
set_capability( "demux", 10 )
set_callbacks( Import_ASX, Close_ASX )
set_callbacks( Import_ASX, NULL )
add_submodule ()
set_description( N_("Kasenna MediaBase parser") )
add_shortcut( "playlist", "sgimb" )
......
......@@ -53,7 +53,6 @@ void Close_xspf ( vlc_object_t * );
int Import_Shoutcast ( vlc_object_t * );
int Import_ASX ( vlc_object_t * );
void Close_ASX ( vlc_object_t * );
int Import_SGIMB ( vlc_object_t * );
void Close_SGIMB ( vlc_object_t * );
......
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