# HG changeset patch
# User ods15
# Date 1133932327 0
# Node ID 637a2f4ff216b2b915378d85393a4565a9cc371f
# Parent  f6aa78b1a49c9fe896c68770febe85331ec4a95e
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
print bogus stuff.

diff -r f6aa78b1a49c -r 637a2f4ff216 codec-cfg.c
--- a/codec-cfg.c	Wed Dec 07 00:57:32 2005 +0000
+++ b/codec-cfg.c	Wed Dec 07 05:12:07 2005 +0000
@@ -886,10 +886,6 @@
 int use_gui = 0;
 #endif
 
-int mp_msg_levels[MSGT_MAX];
-int mp_msg_level_all = MSGL_ERR;
-int verbose = 0;
-
 void wrapline(FILE *f2,char *s){
     int c;
     if(!s){
@@ -1002,8 +998,6 @@
         int dshow=-1;
         int win32ex=-1;
 
-	mp_msg_init();
-
 	/*
 	 * Take path to codecs.conf from command line, or fall back on
 	 * etc/codecs.conf
@@ -1152,17 +1146,11 @@
 #endif
 
 #ifdef TESTING
-int mp_msg_levels[MSGT_MAX];
-int mp_msg_level_all = MSGL_STATUS;
-int verbose = 0;
-
 int main(void)
 {
 	codecs_t *c;
         int i,j, nr_codecs, state;
 
-	mp_msg_init();
-
 	if (!(parse_codec_cfg("etc/codecs.conf")))
 		return 0;
 	if (!video_codecs)
diff -r f6aa78b1a49c -r 637a2f4ff216 mencoder.c
--- a/mencoder.c	Wed Dec 07 00:57:32 2005 +0000
+++ b/mencoder.c	Wed Dec 07 05:12:07 2005 +0000
@@ -129,7 +129,7 @@
 //void skip_audio_frame(sh_audio_t *sh_audio){}
 //void resync_audio_stream(sh_audio_t *sh_audio){}
 
-int verbose=0; // must be global!
+extern int verbose; // must be global!
 int identify=0;
 int quiet=0;
 double video_time_usage=0;
@@ -140,8 +140,8 @@
 double cur_vout_time_usage=0;
 int benchmark=0;
 
-int mp_msg_levels[MSGT_MAX]; // inited to -2
-int mp_msg_level_all = MSGL_STATUS;
+extern int mp_msg_levels[MSGT_MAX];
+extern int mp_msg_level_all;
 
 #ifdef WIN32
 char * proc_priority=NULL;
diff -r f6aa78b1a49c -r 637a2f4ff216 mp_msg.c
--- a/mp_msg.c	Wed Dec 07 00:57:32 2005 +0000
+++ b/mp_msg.c	Wed Dec 07 05:12:07 2005 +0000
@@ -20,9 +20,9 @@
 /* maximum message length of mp_msg */
 #define MSGSIZE_MAX 3072
 
-extern int mp_msg_levels[MSGT_MAX]; // verbose level of this module
-extern int mp_msg_level_all;
-extern int verbose;
+int mp_msg_levels[MSGT_MAX]; // verbose level of this module. inited to 2
+int mp_msg_level_all = MSGL_STATUS;
+int verbose = 0;
 
 void mp_msg_init(){
     int i;
diff -r f6aa78b1a49c -r 637a2f4ff216 mplayer.c
--- a/mplayer.c	Wed Dec 07 00:57:32 2005 +0000
+++ b/mplayer.c	Wed Dec 07 05:12:07 2005 +0000
@@ -86,7 +86,7 @@
 
 int slave_mode=0;
 int player_idle_mode=0;
-int verbose=0;
+extern int verbose;
 int identify=0;
 int quiet=0;
 
@@ -343,8 +343,8 @@
 int global_sub_indices[SUB_SOURCES];
 int global_sub_quiet_osd_hack = 0;
 
-int mp_msg_levels[MSGT_MAX]; // inited to -2
-int mp_msg_level_all = MSGL_STATUS;
+extern int mp_msg_levels[MSGT_MAX];
+extern int mp_msg_level_all;
 
 static stream_t* stream=NULL;
 static demuxer_t *demuxer=NULL;