diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /parser-mpcmd.c | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'parser-mpcmd.c')
| -rw-r--r-- | parser-mpcmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parser-mpcmd.c b/parser-mpcmd.c index 5d15dc3e55..b0562fb86c 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -77,7 +77,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) 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 - extern play_tree_t *macosx_finder_args(m_config_t *, int , char **); + play_tree_t *macosx_finder_args(m_config_t *, int , char **); #endif #ifdef MP_DEBUG |