Commit 743502eb authored by Laurent Aimar's avatar Laurent Aimar

ninput.h: added prototype of demux2_vaControlHelper.

 include/vlc_meta.h: added of cast for malloc because of [CENSURED] c++.
parent 028552b9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ninput.h * ninput.h
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: ninput.h,v 1.28 2004/02/14 01:53:17 gbazin Exp $ * $Id: ninput.h,v 1.29 2004/03/03 12:01:17 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -297,6 +297,7 @@ VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_lis ...@@ -297,6 +297,7 @@ VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_lis
#define demux2_New( a, b, c, d ) __demux2_New(VLC_OBJECT(a), b, c, d) #define demux2_New( a, b, c, d ) __demux2_New(VLC_OBJECT(a), b, c, d)
VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_mrl, stream_t *s, es_out_t *out ) ); VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_mrl, stream_t *s, es_out_t *out ) );
VLC_EXPORT( void, demux2_Delete, ( demux_t * ) ); VLC_EXPORT( void, demux2_Delete, ( demux_t * ) );
VLC_EXPORT( int, demux2_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
static inline int demux2_Demux( demux_t *p_demux ) static inline int demux2_Demux( demux_t *p_demux )
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc_meta.h * vlc_meta.h
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id: vlc_meta.h,v 1.1 2004/01/31 05:24:55 fenrir Exp $ * $Id: vlc_meta.h,v 1.2 2004/03/03 12:01:17 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -54,7 +54,7 @@ struct vlc_meta_t ...@@ -54,7 +54,7 @@ struct vlc_meta_t
static inline vlc_meta_t *vlc_meta_New( void ) static inline vlc_meta_t *vlc_meta_New( void )
{ {
vlc_meta_t *m = malloc( sizeof( vlc_meta_t ) ); vlc_meta_t *m = (vlc_meta_t*)malloc( sizeof( vlc_meta_t ) );
m->i_meta = 0; m->i_meta = 0;
m->name = NULL; m->name = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment