diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:36:44 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:36:44 +0000 |
| commit | e01e094438ad05c052b0694d99548498d1602b3d (patch) | |
| tree | dcbaf1e13736d66dd56da05ad79f75f1dd9ab269 /libmpdemux | |
| parent | e606c4652665b26b5560b3b28a13b8fd6c87c951 (diff) | |
| download | mpv-e01e094438ad05c052b0694d99548498d1602b3d.tar.bz2 mpv-e01e094438ad05c052b0694d99548498d1602b3d.tar.xz | |
Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30627 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_avi.c | 5 | ||||
| -rw-r--r-- | libmpdemux/demux_ogg.c | 1 | ||||
| -rw-r--r-- | libmpdemux/demux_ogg.h | 27 |
3 files changed, 29 insertions, 4 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 89ec44549e..eb9b586706 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -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; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index cc8b65cd43..80bc1d248b 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -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', ' ') diff --git a/libmpdemux/demux_ogg.h b/libmpdemux/demux_ogg.h new file mode 100644 index 0000000000..0bdc30b910 --- /dev/null +++ b/libmpdemux/demux_ogg.h @@ -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 */ |