Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / input / demux.h

diff --git a/src/input/demux.h b/src/input/demux.h
index e206e350fcfaf675d3b4dd3ff8c4f5693c41cd82..8e9aa27088f644b2409b3b927563206fd698851c 100644 (file)
--- a/src/input/demux.h
+++ b/src/input/demux.h
@@ -32,14 +32,19 @@
 #include <vlc_common.h>
 #include <vlc_demux.h>
 
+#include "stream.h"
+
 /* stream_t *s could be null and then it mean a access+demux in one */
-#define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
-demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
+#define demux_New( a, b, c, d, e, f, g, h ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g,h)
+demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
 
-void demux_Delete(demux_t *);
+void demux_Delete( demux_t * );
 
 static inline int demux_Demux( demux_t *p_demux )
 {
+    if( !p_demux->pf_demux )
+        return 1;
+
     return p_demux->pf_demux( p_demux );
 }
 static inline int demux_vaControl( demux_t *p_demux, int i_query, va_list args )