Mercurial > mplayer.hg
view playtreeparser.h @ 26146:20a126aaa756
ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.
I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).
author | uau |
---|---|
date | Thu, 06 Mar 2008 01:57:26 +0000 |
parents | 83c95bd31aab |
children | c1a3f1bbba26 |
line wrap: on
line source
#ifndef MPLAYER_PLAYTREEPARSER_H #define MPLAYER_PLAYTREEPARSER_H #include "playtree.h" /// \defgroup PlaytreeParser Playtree parser /// \ingroup Playtree /// /// The playtree parser allows to read various playlist formats. It reads from /// a stream allowing to handle playlists from local files and the network. ///@{ /// \file struct stream_st; typedef struct play_tree_parser { struct stream_st* stream; char *buffer,*iter,*line; int buffer_size , buffer_end; int deep,keep; } play_tree_parser_t; /// Create a new parser. /** \param stream The stream to read from. * \param deep Parser depth. Some formats allow including other files, * this is used to track the inclusion depth. * \return The new parser. */ play_tree_parser_t* play_tree_parser_new(struct stream_st* stream,int deep); /// Destroy a parser. void play_tree_parser_free(play_tree_parser_t* p); /// Build a playtree from the playlist opened with the parser. /** \param p The parser. * \param forced If non-zero the playlist file was explicitly * given by the user, allow falling back on * one filename per line playlist. * \return A new playtree or NULL on error. */ play_tree_t* play_tree_parser_get_play_tree(play_tree_parser_t* p, int forced); /// Wrapper for play_tree_add_basepath (add base path from file). void play_tree_add_bpf(play_tree_t* pt, char* filename); ///@} #endif /* MPLAYER_PLAYTREEPARSER_H */