diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /parser-mpcmd.c | |
parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz |
Merge svn changes up to r30732
Diffstat (limited to 'parser-mpcmd.c')
-rw-r--r-- | parser-mpcmd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/parser-mpcmd.c b/parser-mpcmd.c index 38cac3e5a0..c6d3b2daf3 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -36,6 +36,7 @@ #include "m_config.h" #include "playtree.h" #include "parser-mpcmd.h" +#include "osdep/macosx_finder_args.h" static int recursion_depth = 0; static int mode = 0; @@ -93,9 +94,6 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) int no_more_opts = 0; int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything play_tree_t *last_parent, *last_entry = NULL, *root; -#ifdef CONFIG_MACOSX_FINDER - play_tree_t *macosx_finder_args(m_config_t *, int , char **); -#endif #ifdef MP_DEBUG assert(config != NULL); |