/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_codecs.h>
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("XA demuxer") );
+ set_description( N_("XA demuxer") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 10 );
+ set_capability( "demux", 10 );
set_callbacks( Open, Close );
vlc_module_end();
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
xa_header_t p_xa;
- uint8_t *p_buf;
+ const uint8_t *p_buf;
/* XA file heuristic */
if( stream_Peek( p_demux->s, &p_buf, sizeof( p_xa ) )
{
demux_sys_t *p_sys = p_demux->p_sys;
- return demux2_vaControlHelper( p_demux->s, p_sys->i_data_offset,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_data_offset,
p_sys->i_data_size ? p_sys->i_data_offset
+ p_sys->i_data_size : -1,
p_sys->fmt.i_bitrate,