diff options
| -rw-r--r-- | codec-cfg.c | 12 | ||||
| -rw-r--r-- | mencoder.c | 6 | ||||
| -rw-r--r-- | mp_msg.c | 6 | ||||
| -rw-r--r-- | mplayer.c | 6 |
4 files changed, 9 insertions, 21 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 05ed7064c5..afa33e5626 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -886,10 +886,6 @@ void gtkMessageBox( int type,char * str ) { return; } 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 main(int argc, char* argv[]) 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 @@ int main(int argc, char* argv[]) #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 --git a/mencoder.c b/mencoder.c index ec27dacc25..63d7dc129f 100644 --- a/mencoder.c +++ b/mencoder.c @@ -129,7 +129,7 @@ int out_file_format=MUXER_TYPE_AVI; // default to AVI //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_video_time_usage=0; 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; @@ -20,9 +20,9 @@ extern int use_gui; /* 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; @@ -86,7 +86,7 @@ extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size); 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_pos = -1; // this encompasses all subtitle sources 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; |