Mercurial > mplayer.hg
changeset 30587:5df7d33f5545
Add header for asf_check_header, read_asf_header; avoids forward declarations.
author | diego |
---|---|
date | Wed, 17 Feb 2010 23:45:01 +0000 |
parents | 84a83a93046a |
children | 4cc35c457d9e |
files | libmpdemux/asfheader.c libmpdemux/asfheader.h libmpdemux/demux_asf.c |
diffstat | 3 files changed, 30 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/asfheader.c Wed Feb 17 23:40:48 2010 +0000 +++ b/libmpdemux/asfheader.c Wed Feb 17 23:45:01 2010 +0000 @@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/asfheader.h Wed Feb 17 23:45:01 2010 +0000 @@ -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 */
--- a/libmpdemux/demux_asf.c Wed Feb 17 23:40:48 2010 +0000 +++ b/libmpdemux/demux_asf.c Wed Feb 17 23:45:01 2010 +0000 @@ -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] /**