[MPlayer-cvslog] r30572 - in trunk: input/input.h mplayer.c

[diego]

Author: diego
Date: Sun Feb 14 13:39:58 2010
New Revision: 30572

Log:
Declare mp_input_register_options() in input/input.h.
This also avoids a forward declaration in mplayer.c.

Modified:
   trunk/input/input.h
   trunk/mplayer.c

Modified: trunk/input/input.h
==============================================================================
--- trunk/input/input.h	Sun Feb 14 13:31:24 2010	(r30571)
+++ trunk/input/input.h	Sun Feb 14 13:39:58 2010	(r30572)
@@ -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);

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Feb 14 13:31:24 2010	(r30571)
+++ trunk/mplayer.c	Sun Feb 14 13:39:58 2010	(r30572)
@@ -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 )