DEMUX_CAN_SEEK, /* arg1= bool* can fail (assume false)*/
};
-VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
+VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int64_t i_bitrate, int i_align, int i_query, va_list args ) );
/*************************************************************************
* Miscellaneous helpers for demuxers
#define DEMUX_INIT_COMMON() do { \
p_demux->pf_control = Control; \
p_demux->pf_demux = Demux; \
- MALLOC_ERR( p_demux->p_sys, demux_sys_t ); \
+ p_demux->p_sys = malloc( sizeof( demux_sys_t ) ); \
+ if( !p_demux->p_sys ) return VLC_ENOMEM;\
memset( p_demux->p_sys, 0, sizeof( demux_sys_t ) ); } while(0)
-#define STANDARD_DEMUX_INIT_MSG( msg ) do { \
- DEMUX_INIT_COMMON(); \
- msg_Dbg( p_demux, "%s", msg ); } while(0)
-
-#define DEMUX_BY_EXTENSION( ext ) \
- demux_t *p_demux = (demux_t *)p_this; \
- if( !demux_IsPathExtension( p_demux, ext ) ) \
- return VLC_EGENERIC; \
- DEMUX_INIT_COMMON();
-
-#define DEMUX_BY_EXTENSION_MSG( ext, msg ) \
- demux_t *p_demux = (demux_t *)p_this; \
- if( !demux_IsPathExtension( p_demux, ext ) ) \
- return VLC_EGENERIC; \
- STANDARD_DEMUX_INIT_MSG( msg );
-
-#define DEMUX_BY_EXTENSION_OR_FORCED( ext, module ) \
- demux_t *p_demux = (demux_t *)p_this; \
- if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
- return VLC_EGENERIC; \
- DEMUX_INIT_COMMON();
-
-#define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \
- demux_t *p_demux = (demux_t *)p_this; \
- if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
- return VLC_EGENERIC; \
- STANDARD_DEMUX_INIT_MSG( msg );
-
-#define CHECK_PEEK( zepeek, size ) \
- if( stream_Peek( p_demux->s , &zepeek, size ) < size ){ \
- msg_Dbg( p_demux, "not enough data" ); return VLC_EGENERIC; }
-
-#define CHECK_PEEK_GOTO( zepeek, size ) \
- if( stream_Peek( p_demux->s , &zepeek, size ) < size ) { \
- msg_Dbg( p_demux, "not enough data" ); goto error; }
-
-#define POKE( peek, stuff, size ) (strncasecmp( (const char *)peek, stuff, size )==0)
-
/**
* @}
*/