diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:45:01 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:45:01 +0000 |
| commit | 01df6700de05935c9fc1c595d406165f4b1008d4 (patch) | |
| tree | 5fdb1acf0b40a0f81543d2b548f07f80f13669c2 /libmpdemux | |
| parent | e52d7ceb38bd6277e17b5e3fabe6d6e59c16e032 (diff) | |
| download | mpv-01df6700de05935c9fc1c595d406165f4b1008d4.tar.bz2 mpv-01df6700de05935c9fc1c595d406165f4b1008d4.tar.xz | |
Add header for asf_check_header, read_asf_header; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30629 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/asfheader.c | 2 | ||||
| -rw-r--r-- | libmpdemux/asfheader.h | 28 | ||||
| -rw-r--r-- | libmpdemux/demux_asf.c | 6 |
3 files changed, 30 insertions, 6 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index d0532f1e3d..1040df540d 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -33,8 +33,8 @@ #include "stheader.h" #include "asf.h" - #include "asfguid.h" +#include "asfheader.h" typedef struct { // must be 0 for metadata record, might be non-zero for metadata lib record diff --git a/libmpdemux/asfheader.h b/libmpdemux/asfheader.h new file mode 100644 index 0000000000..9c239f7987 --- /dev/null +++ b/libmpdemux/asfheader.h @@ -0,0 +1,28 @@ +/* + * 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_ASFHEADER_H +#define MPLAYER_ASFHEADER_H + +#include "asf.h" +#include "demuxer.h" + +int asf_check_header(demuxer_t *demuxer); +int read_asf_header(demuxer_t *demuxer, struct asf_priv *asf); + +#endif /* MPLAYER_ASFHEADER_H */ diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index c880028af5..32a2c5bda0 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -30,16 +30,12 @@ #include "stream/stream.h" #include "asf.h" +#include "asfheader.h" #include "demuxer.h" #include "libmpcodecs/dec_audio.h" #include "libvo/fastmemcpy.h" #include "libavutil/intreadwrite.h" -// defined at asfheader.c: - -int asf_check_header(demuxer_t *demuxer); -int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf); - // based on asf file-format doc by Eugene [http://divx.euro.ru] /** |