X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.h;h=3372f17229d5ff15ab1729464a0db7ac202eb1ab;hb=1128f3cbdc26967841d38cdffa41e7bd1afa2d76;hp=084185f590b516143ce81e2208248f5b7e838443;hpb=0432a0e58128e028233828671fdc842d4c9bf93e;p=vlc

diff --git a/src/input/demux.h b/src/input/demux.h
index 084185f590..3372f17229 100644
--- a/src/input/demux.h
+++ b/src/input/demux.h
@@ -1,33 +1,29 @@
 /*****************************************************************************
  * demux.h: Input demux functions
  *****************************************************************************
- * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 1998-2008 VLC authors and VideoLAN
  * Copyright (C) 2008 Laurent Aimar
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
-
-#ifndef _INPUT_DEMUX_H
-#define _INPUT_DEMUX_H 1
+#ifndef LIBVLC_INPUT_DEMUX_H
+#define LIBVLC_INPUT_DEMUX_H 1
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
@@ -35,13 +31,16 @@
 #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 );
+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 );
+#define demux_New( a, b, c, d, e, f, g, h ) demux_New(VLC_OBJECT(a),b,c,d,e,f,g,h)
 
 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 )
@@ -60,4 +59,3 @@ static inline int demux_Control( demux_t *p_demux, int i_query, ... )
 }
 
 #endif
-