From 89dfec20a2ec4b264d3f89dba37694b856d4cebf Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Feb 2010 12:39:58 +0000 Subject: [PATCH] Declare mp_input_register_options() in input/input.h. This also avoids a forward declaration in mplayer.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30572 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.h | 4 ++++ mplayer.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/input/input.h b/input/input.h index 12a56c8509..29e801d374 100644 --- a/input/input.h +++ b/input/input.h @@ -19,6 +19,8 @@ #ifndef MPLAYER_INPUT_H #define MPLAYER_INPUT_H +#include "m_config.h" + // All command IDs typedef enum { MP_CMD_SEEK, @@ -318,6 +320,8 @@ mp_input_init(int use_gui); void mp_input_uninit(void); +void mp_input_register_options(m_config_t* cfg); + // Interruptible usleep: (used by libmpdemux) int mp_input_check_interrupt(int time); diff --git a/mplayer.c b/mplayer.c index 7637a75658..42f778a04c 100644 --- a/mplayer.c +++ b/mplayer.c @@ -847,8 +847,6 @@ static void exit_sighandler(int x){ exit(1); } -void mp_input_register_options(m_config_t* cfg); - #include "cfg-mplayer.h" static void parse_cfgfiles( m_config_t* conf )