Sanitize input headers (pass 2).

src/Makefile.am

@@ -308,6 +308,7 @@ SOURCES_libvlc_common = \
 	input/meta.c \
 	input/clock.h \
 	input/decoder.h \
+	input/demux.h \
 	input/es_out.h \
 	input/input_internal.h \
 	input/vlm_internal.h \

src/input/demux.c

@@ -29,6 +29,7 @@
 #include <vlc_codec.h>
 
 #include "input_internal.h"
+#include "demux.h"
 
 static bool SkipID3Tag( demux_t * );
 static bool SkipAPETag( demux_t *p_demux );

src/input/demux.h

+/*****************************************************************************
+ * demux.h: Input demux functions
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#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
+
+#include <vlc_common.h>
+#include <vlc_demux.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 );
+
+void demux_Delete(demux_t *);
+
+static inline int demux_Demux( demux_t *p_demux )
+{
+    return p_demux->pf_demux( p_demux );
+}
+static inline int demux_vaControl( demux_t *p_demux, int i_query, va_list args )
+{
+    return p_demux->pf_control( p_demux, i_query, args );
+}
+static inline int demux_Control( demux_t *p_demux, int i_query, ... )
+{
+    va_list args;
+    int     i_result;
+
+    va_start( args, i_query );
+    i_result = demux_vaControl( p_demux, i_query, args );
+    va_end( args );
+    return i_result;
+}
+
+#endif
+

src/input/input.c

@@ -37,6 +37,7 @@
 
 #include "input_internal.h"
 #include "es_out.h"
+#include "demux.h"
 
 #include <vlc_sout.h>
 #include "../stream_output/stream_output.h"

src/input/input_internal.h

@@ -381,34 +381,6 @@ access_t * access_FilterNew( access_t *p_source,
                               const char *psz_access_filter );
 void access_Delete( access_t * );
 
-/* Demuxer */
-#include <vlc_demux.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 );
-
-void demux_Delete(demux_t *);
-
-static inline int demux_Demux( demux_t *p_demux )
-{
-    return p_demux->pf_demux( p_demux );
-}
-static inline int demux_vaControl( demux_t *p_demux, int i_query, va_list args )
-{
-    return p_demux->pf_control( p_demux, i_query, args );
-}
-static inline int demux_Control( demux_t *p_demux, int i_query, ... )
-{
-    va_list args;
-    int     i_result;
-
-    va_start( args, i_query );
-    i_result = demux_vaControl( p_demux, i_query, args );
-    va_end( args );
-    return i_result;
-}
-
 /* Stream */
 /**
  * stream_t definition