summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-04 21:45:36 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-04 21:45:36 +0000
commit2a9e515c77a3db3881997fb6e59b397680e4c3e8 (patch)
tree13a05dceb3e48fcb0c5cfe5cc100e9d89d1dab10
parent622540e56f6d0519e41c9ed72c5cdcba2163a336 (diff)
downloadmpv-2a9e515c77a3db3881997fb6e59b397680e4c3e8.tar.bz2
mpv-2a9e515c77a3db3881997fb6e59b397680e4c3e8.tar.xz
Move duplicated extern declarations of mp_msg_levels and mp_msg_level_all
to cfg-common.h where they are really needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-common.h3
-rw-r--r--mencoder.c3
-rw-r--r--mplayer.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 8c29fa6ba1..96d20a0e2d 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -587,6 +587,9 @@ const m_option_t audio_filter_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
+extern int mp_msg_levels[MSGT_MAX];
+extern int mp_msg_level_all;
+
const m_option_t msgl_config[]={
{ "all", &mp_msg_level_all, CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL},
diff --git a/mencoder.c b/mencoder.c
index 97dba778c7..340ad1e6fa 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -143,9 +143,6 @@ double cur_video_time_usage=0;
double cur_vout_time_usage=0;
int benchmark=0;
-extern int mp_msg_levels[MSGT_MAX];
-extern int mp_msg_level_all;
-
#ifdef WIN32
char * proc_priority=NULL;
#endif
diff --git a/mplayer.c b/mplayer.c
index 9a0c9787d5..ea6edeedaa 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -332,9 +332,6 @@ int suboverlap_enabled = 1;
#include "libass/ass_mp.h"
#endif
-extern int mp_msg_levels[MSGT_MAX];
-extern int mp_msg_level_all;
-
char* current_module=NULL; // for debugging