diff options
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cfg-common.h b/cfg-common.h index 272a60c639..b6e4654e8f 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -239,7 +239,6 @@ extern int mf_w; extern int mf_h; extern double mf_fps; extern char * mf_type; -extern m_obj_settings_t* vf_settings; extern m_obj_list_t vf_obj_list; const m_option_t mfopts_conf[]={ @@ -267,7 +266,6 @@ const m_option_t msgl_config[]={ { "global", &mp_msg_levels[MSGT_GLOBAL], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "cplayer", &mp_msg_levels[MSGT_CPLAYER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, - { "gplayer", &mp_msg_levels[MSGT_GPLAYER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "vo", &mp_msg_levels[MSGT_VO], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "ao", &mp_msg_levels[MSGT_AO], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "demuxer", &mp_msg_levels[MSGT_DEMUXER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, @@ -313,11 +311,10 @@ const m_option_t msgl_config[]={ {"help", "Available msg modules:\n" " global - common player errors/information\n" " cplayer - console player (mplayer.c)\n" - " gplayer - gui player\n" - " vo - libvo\n" - " ao - libao\n" + " vo - libvo\n" + " ao - libao\n" " demuxer - demuxer.c (general stuff)\n" - " ds - demux stream (add/read packet etc)\n" + " ds - demux stream (add/read packet etc)\n" " demux - fileformat-specific stuff (demux_*.c)\n" " header - fileformat-specific header (*header.c)\n" " avsync - mplayer.c timer stuff\n" @@ -328,14 +325,14 @@ const m_option_t msgl_config[]={ " seek - seeking code\n" " win32 - win32 dll stuff\n" " open - open.c (stream opening)\n" - " dvd - open.c (DVD init/read/seek)\n" + " dvd - open.c (DVD init/read/seek)\n" " parsees - parse_es.c (mpeg stream parser)\n" " lirc - lirc_mp.c and input lirc driver\n" " stream - stream.c\n" " cache - cache2.c\n" " mencoder\n" " xacodec - XAnim codecs\n" - " tv - TV input subsystem\n" + " tv - TV input subsystem\n" " osdep - OS-dependent parts\n" " spudec - spudec.c\n" " playtree - Playtree handling (playtree.c, playtreeparser.c)\n" @@ -353,7 +350,7 @@ const m_option_t msgl_config[]={ " netst - Netstream\n" " muxer - muxer layer\n" " identify - identify output\n" - " ass - libass messages\n" + " ass - libass messages\n" " statusline - playback/encoding status line\n" "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} |