/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
/* TODO:
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("Nuv demuxer") );
- set_capability( "demux2", 145 );
+ set_description( N_("Nuv demuxer") );
+ set_capability( "demux", 145 );
set_callbacks( Open, Close );
add_shortcut( "nuv" );
vlc_module_end();
demux_sys_t *p_sys;
const uint8_t *p_peek;
frame_header_t fh;
- vlc_bool_t b_extended;
+ bool b_extended;
/* Check id */
if( stream_Peek( p_demux->s, &p_peek, 12 ) != 12 ||
goto error;
if( p_peek[0] == 'X' )
{
- b_extended = VLC_TRUE;
+ b_extended = true;
if( FrameHeaderLoad( p_demux, &fh ) )
goto error;
}
else
{
- b_extended = VLC_FALSE;
+ b_extended = false;
/* XXX: for now only file with extended chunk are supported
* why: because else we need to have support for rtjpeg+stupid nuv shit */
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- if( p_sys->p_extra_f )
- free( p_sys->p_extra_f );
+ free( p_sys->p_extra_f );
demux_IndexClean( &p_sys->idx );
free( p_sys );
}
for( ;; )
{
- if( p_demux->b_die )
+ if( !vlc_object_alive (p_demux) )
return -1;
if( FrameHeaderLoad( p_demux, &fh ) )
return VLC_EGENERIC;
}
- while( !p_demux->b_die )
+ while( vlc_object_alive (p_demux) )
{
frame_header_t fh;
int64_t i_tell;
p_sys->i_pcr = -1;
- while( !p_demux->b_die )
+ while( vlc_object_alive (p_demux) )
{
frame_header_t fh;
}
static void demux_IndexClean( demux_index_t *p_idx )
{
- if( p_idx->idx )
- {
- free( p_idx->idx );
- p_idx->idx = NULL;
- }
+ free( p_idx->idx );
+ p_idx->idx = NULL;
}
static void demux_IndexAppend( demux_index_t *p_idx,
int64_t i_time, int64_t i_offset )