#include <vlc_plugin.h>
#include <vlc_demux.h>
-#include <vlc_codecs.h>
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
set_subcategory( SUBCAT_INPUT_DEMUX )
set_capability( "demux", 3 )
set_callbacks( Open, Close )
- add_shortcut( "cdg" )
- add_shortcut( "subtitle" )
+ add_shortcut( "cdg", "subtitle" )
vlc_module_end ()
/*****************************************************************************
// return VLC_EGENERIC;
// }
+ p_sys = malloc( sizeof( demux_sys_t ) );
+ if( unlikely(p_sys == NULL) )
+ return VLC_ENOMEM;
+
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ p_demux->p_sys = p_sys;
/* */
es_format_Init( &p_sys->fmt, VIDEO_ES, VLC_CODEC_CDG );