[MPlayer-cvslog] r30627 - in trunk/libmpdemux: demux_avi.c demux_ogg.c demux_ogg.h

[diego]

Author: diego
Date: Thu Feb 18 00:36:44 2010
New Revision: 30627

Log:
Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.

Added:
   trunk/libmpdemux/demux_ogg.h
Modified:
   trunk/libmpdemux/demux_avi.c
   trunk/libmpdemux/demux_ogg.c

Modified: trunk/libmpdemux/demux_avi.c
==============================================================================
--- trunk/libmpdemux/demux_avi.c	Thu Feb 18 00:33:17 2010	(r30626)
+++ trunk/libmpdemux/demux_avi.c	Thu Feb 18 00:36:44 2010	(r30627)
@@ -30,12 +30,9 @@
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-
+#include "demux_ogg.h"
 #include "aviheader.h"
 
-demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
-int demux_ogg_open(demuxer_t* demuxer);
-
 extern const demuxer_desc_t demuxer_desc_avi_ni;
 extern const demuxer_desc_t demuxer_desc_avi_nini;
 

Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c	Thu Feb 18 00:33:17 2010	(r30626)
+++ trunk/libmpdemux/demux_ogg.c	Thu Feb 18 00:36:44 2010	(r30627)
@@ -32,6 +32,7 @@
 #include "stheader.h"
 #include "libavutil/intreadwrite.h"
 #include "demux_mov.h"
+#include "demux_ogg.h"
 
 #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's')
 #define FOURCC_SPEEX  mmioFOURCC('s', 'p', 'x', ' ')

Added: trunk/libmpdemux/demux_ogg.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_ogg.h	Thu Feb 18 00:36:44 2010	(r30627)
@@ -0,0 +1,27 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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.
+ *
+ * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_DEMUX_OGG_H
+#define MPLAYER_DEMUX_OGG_H
+
+#include "demuxer.h"
+
+int demux_ogg_open(demuxer_t *demuxer);
+demuxer_t *init_avi_with_ogg(demuxer_t *demuxer);
+
+#endif /* MPLAYER_DEMUX_OGG_H */