* Preamble
*****************************************************************************/
#include "config.h"
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
N_("Force the subtiles format. Use \"auto\", the set of supported values varies.")
vlc_module_begin();
- set_shortname( _("Subtitles (asa demuxer)"));
- set_description( _("Text subtitles parser") );
+ set_shortname( N_("Subtitles (asa demuxer)"));
+ set_description( N_("Text subtitles parser") );
set_capability( "demux", 50 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
p_sys->psz_header = NULL;
p_sys->i_subtitle = 0;
p_sys->i_subtitles = 0;
p_data = malloc( i_ssize );
if( !p_data )
{
- msg_Err( p_demux, "out of memory");
free( p_sys );
return VLC_ENOMEM;
}
if( !( p_sys->subtitle = realloc( p_sys->subtitle, sizeof(subtitle_t)
* p_sys->i_subs_alloc ) ) )
{
- msg_Err( p_demux, "out of memory");
return VLC_ENOMEM;
}
}