Mercurial > mplayer.hg

changeset 30530:c5d1693acb35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Declare mp_input_register_options() in input/input.h. This also avoids a forward declaration in mplayer.c.
author diego
date Sun, 14 Feb 2010 12:39:58 +0000
parents 6ef41a766a74
children 704903d34069
files input/input.h mplayer.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/input/input.h	Sun Feb 14 12:31:24 2010 +0000
+++ b/input/input.h	Sun Feb 14 12:39:58 2010 +0000
@@ -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 @@
 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);
--- a/mplayer.c	Sun Feb 14 12:31:24 2010 +0000
+++ b/mplayer.c	Sun Feb 14 12:39:58 2010 +0000
@@ -847,8 +847,6 @@
   exit(1);
 }
 
-void mp_input_register_options(m_config_t* cfg);
-
 #include "cfg-mplayer.h"
 
 static void parse_cfgfiles( m_config_t* conf )