diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
commit | 90f5873f1a4b528dc245beb75b834c52ef04b3db (patch) | |
tree | 9ede9db5ad14d812f1211510b9e48ea11c915458 /playtreeparser.c | |
parent | 15a604c405cb53054853cdc426e124936d6321d8 (diff) | |
parent | 8ba6b4eaf939f34ac34993aa225143b4102f6c02 (diff) | |
download | mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.bz2 mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.xz |
Merge svn changes up to r30675
Diffstat (limited to 'playtreeparser.c')
-rw-r--r-- | playtreeparser.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/playtreeparser.c b/playtreeparser.c index 8868d20694..65deefff6d 100644 --- a/playtreeparser.c +++ b/playtreeparser.c @@ -30,6 +30,7 @@ #include <fcntl.h> #include <unistd.h> #include <ctype.h> +#include "asxparser.h" #include "m_config.h" #include "playtree.h" #include "playtreeparser.h" @@ -37,9 +38,6 @@ #include "libmpdemux/demuxer.h" #include "mp_msg.h" -struct m_config; -extern play_tree_t* -asx_parser_build_tree(struct m_config *mconfig, char* buffer, int ref); #define BUF_STEP 1024 |