* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
#include "input_internal.h"
if( *p_demux->psz_demux == '\0' )
{
free( p_demux->psz_demux );
- p_demux->psz_demux = var_GetString( p_obj, "demux" );
+ p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" );
+ if( p_demux->psz_demux == NULL )
+ p_demux->psz_demux = strdup( "" );
}
if( !b_quick )
case DEMUX_SET_NEXT_DEMUX_TIME:
case DEMUX_GET_TITLE_INFO:
case DEMUX_SET_GROUP:
+ case DEMUX_GET_ATTACHMENTS:
return VLC_EGENERIC;
default:
} d_stream_sys_t;
static int DStreamRead ( stream_t *, void *p_read, int i_read );
-static int DStreamPeek ( stream_t *, uint8_t **pp_peek, int i_peek );
+static int DStreamPeek ( stream_t *, const uint8_t **pp_peek, int i_peek );
static int DStreamControl( stream_t *, int i_query, va_list );
static int DStreamThread ( stream_t * );
if( psz_demux == NULL || *psz_demux == '\0' ) return NULL;
s = vlc_stream_create( p_obj );
- s->pf_block = NULL;
s->pf_read = DStreamRead;
s->pf_peek = DStreamPeek;
s->pf_control= DStreamControl;
return i_out;
}
-static int DStreamPeek( stream_t *s, uint8_t **pp_peek, int i_peek )
+static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, int i_peek )
{
d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
block_t **pp_block = &p_sys->p_block;
****************************************************************************/
static void SkipID3Tag( demux_t *p_demux )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
uint8_t version, revision;
int i_size;
int b_footer;