Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.112
diff -u -r1.112 codec-cfg.c
--- codec-cfg.c	30 Oct 2004 10:09:52 -0000	1.112
+++ codec-cfg.c	13 Nov 2004 15:32:23 -0000
@@ -504,10 +504,12 @@
 #endif
 	}
 	
-	mp_msg(MSGT_CODECCFG,MSGL_INFO,MSGTR_ReadingFile, cfgfile);
+	mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_ReadingFile, cfgfile);
+	mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_ReadingFile, cfgfile);
 
 	if ((fp = fopen(cfgfile, "r")) == NULL) {
-		mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CantOpenFileError, cfgfile, strerror(errno));
+		mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_CantOpenFileError, cfgfile, strerror(errno));
+		mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_CantOpenFileError, cfgfile, strerror(errno));
 		return 0;
 	}
 
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.256
diff -u -r1.256 mencoder.c
--- mencoder.c	9 Oct 2004 13:07:17 -0000	1.256
+++ mencoder.c	13 Nov 2004 15:32:28 -0000
@@ -390,7 +390,7 @@
 
   mp_msg_init();
   mp_msg_set_level(MSGL_STATUS);
-  mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2004 MPlayer Team\n\n");
+  mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2004 MPlayer Team\n");
 
   /* Test for cpu capabilities (and corresponding OS support) for optimizing */
   GetCpuCaps(&gCpuCaps);
@@ -435,7 +435,7 @@
 	mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
 	mencoder_exit(1,NULL);
       }
-      mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
+      mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf);
     }
   }
 }
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.809
diff -u -r1.809 mplayer.c
--- mplayer.c	9 Nov 2004 20:09:26 -0000	1.809
+++ mplayer.c	13 Nov 2004 15:32:30 -0000
@@ -968,7 +968,7 @@
   mp_msg_init();
   mp_msg_set_level(MSGL_STATUS);
 
-  mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2004 MPlayer Team\n\n");
+  mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2004 MPlayer Team\n");
   /* Test for cpu capabilities (and corresponding OS support) for optimizing */
   GetCpuCaps(&gCpuCaps);
 #ifdef ARCH_X86
@@ -1114,7 +1114,7 @@
 	mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
         exit_player_with_rc(NULL, 0);
       }
-      mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
+      mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
     }
   }
   free( mem_ptr ); // release the buffer created by get_path()
@@ -1270,7 +1264,7 @@
     	    close (rtc_fd);
 	    rtc_fd = -1;
 	} else
-	    mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_UsingRTCTiming, irqp);
+	    mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
     }
   }
 #ifdef HAVE_NEW_GUI
@@ -1280,7 +1280,7 @@
 #endif
     if(rtc_fd<0)
 #endif
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "Using %s timing\n",
+      mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
 	     softsleep?"software":timer_name);
 
 #ifdef USE_TERMCAP
@@ -1434,7 +1429,6 @@
 #endif
 //---------------------------------------------------------------------------
 
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
     if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
 
 //==================== Open VOB-Sub ============================
Index: parser-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-cfg.c,v
retrieving revision 1.6
diff -u -r1.6 parser-cfg.c
--- parser-cfg.c	13 Aug 2003 16:44:39 -0000	1.6
+++ parser-cfg.c	13 Nov 2004 15:32:30 -0000
@@ -42,7 +42,7 @@
 	assert(config != NULL);
 	//	assert(conf_list != NULL);
 #endif
-	mp_msg(MSGT_CFGPARSER,MSGL_INFO,"Reading config file %s", conffile);
+	mp_msg(MSGT_CFGPARSER,MSGL_V,"Reading config file %s", conffile);
 
 	if (recursion_depth > MAX_RECURSION_DEPTH) {
 		mp_msg(MSGT_CFGPARSER,MSGL_ERR,": too deep 'include'. check your configfiles\n");
@@ -59,7 +59,7 @@
 	}
 
 	if ((fp = fopen(conffile, "r")) == NULL) {
-	  mp_msg(MSGT_CFGPARSER,MSGL_ERR,": %s\n", strerror(errno));
+	  mp_msg(MSGT_CFGPARSER,MSGL_V,": %s\n", strerror(errno));
 		free(line);
 		ret = 0;
 		goto out;
Index: input/input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.103
diff -u -r1.103 input.c
--- input/input.c	30 Oct 2004 10:40:53 -0000	1.103
+++ input/input.c	13 Nov 2004 15:32:35 -0000
@@ -1352,7 +1352,7 @@
   fd = open(file,O_RDONLY);
 
   if(fd < 0) {
-    mp_msg(MSGT_INPUT,MSGL_ERR,"Can't open input config file %s: %s\n",file,strerror(errno));
+    mp_msg(MSGT_INPUT,MSGL_V,"Can't open input config file %s: %s\n",file,strerror(errno));
     return 0;
   }
 
@@ -1378,7 +1378,7 @@
     }
     // Empty buffer : return
     if(bs <= 1) {
-      mp_msg(MSGT_INPUT,MSGL_INFO,"Input config file %s parsed: %d binds\n",file,n_binds);
+      mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds);
       if(binds)
 	cmd_binds = binds;
       close(fd);
@@ -1519,8 +1519,8 @@
     // Try global conf dir
     file = MPLAYER_CONFDIR "/input.conf";
     if(! mp_input_parse_config(file))
-      mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n");
+      mp_msg(MSGT_INPUT,MSGL_V,"Falling back on default (hardcoded) input config\n");
   }
   else
   {
 int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){
Index: libmpdemux/demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.173
diff -u -r1.173 demuxer.c
--- libmpdemux/demuxer.c	23 Oct 2004 00:05:38 -0000	1.173
+++ libmpdemux/demuxer.c	13 Nov 2004 15:32:39 -0000
@@ -94,7 +94,7 @@
 }
 
 void free_sh_audio(sh_audio_t* sh){
-    mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_audio at %p  \n",sh);
+    mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_audio at %p  \n",sh);
     if(sh->wf) free(sh->wf);
     free(sh);
 }
@@ -117,7 +117,7 @@
 }
 
 void free_sh_video(sh_video_t* sh){
-    mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_video at %p  \n",sh);
+    mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_video at %p  \n",sh);
     if(sh->bih) free(sh->bih);
     free(sh);
 }
@@ -164,7 +163,7 @@
 
 void free_demuxer(demuxer_t *demuxer){
     int i;
-    mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p  \n",demuxer);
+    mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing demuxer at %p  \n",demuxer);
     switch(demuxer->type) {
     case DEMUXER_TYPE_PVA:
       demux_close_pva(demuxer); break;
Index: libvo/vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.90
diff -u -r1.90 vo_xmga.c
--- libvo/vo_xmga.c	28 Oct 2004 01:15:52 -0000	1.90
+++ libvo/vo_xmga.c	13 Nov 2004 15:32:39 -0000
@@ -165,7 +165,7 @@
                    vo_depthonscreen);
             return -1;
     }
-    mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
+    mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
 
     inited = 1;
 
Index: libvo/vo_xover.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v
retrieving revision 1.10
diff -u -r1.10 vo_xover.c
--- libvo/vo_xover.c	28 Oct 2004 01:15:52 -0000	1.10
+++ libvo/vo_xover.c	13 Nov 2004 15:32:40 -0000
@@ -256,7 +256,7 @@
       mp_msg(MSGT_VO, MSGL_ERR, "Sorry, this (%d) color depth is not supported\n",
 	     vo_depthonscreen);
     }
-  mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
+  mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
 
   aspect(&d_width, &d_height, A_NOZOOM);
 
Index: libvo/vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.70
diff -u -r1.70 vo_xvidix.c
--- libvo/vo_xvidix.c	28 Oct 2004 01:15:52 -0000	1.70
+++ libvo/vo_xvidix.c	13 Nov 2004 15:32:40 -0000
@@ -286,7 +286,7 @@
                    "Sorry, this (%d) color depth is not supported\n",
                    vo_depthonscreen);
     }
-    mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
+    mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
 
     aspect(&d_width, &d_height, A_NOZOOM);
 
Index: libvo/x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.180
diff -u -r1.180 x11_common.c
--- libvo/x11_common.c	4 Nov 2004 18:31:55 -0000	1.180
+++ libvo/x11_common.c	13 Nov 2004 15:32:41 -0000
@@ -1643,7 +1644,7 @@
                 DPMSInfo(mDisplay, &state, &onoff);
                 if (onoff)
                 {
-                    mp_msg(MSGT_VO, MSGL_INFO,
+                    mp_msg(MSGT_VO, MSGL_V,
                            "Successfully enabled DPMS\n");
                 } else
                 {
@@ -1698,7 +1699,7 @@
         {
             Status stat;
 
-            mp_msg(MSGT_VO, MSGL_INFO, "Disabling DPMS\n");
+            mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n");
             dpms_disabled = 1;
             stat = DPMSDisable(mDisplay);       // monitor powersave off
             mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat);
Index: mp3lib/sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.30
diff -u -r1.30 sr1.c
--- mp3lib/sr1.c	6 Apr 2004 01:06:21 -0000	1.30
+++ mp3lib/sr1.c	13 Nov 2004 15:32:41 -0000
@@ -462,7 +462,7 @@
 
     init_layer2();
     init_layer3(fr.down_sample_sblimit);
-    mp_msg(MSGT_DECAUDIO,MSGL_INFO,"MP3lib: init layer2&3 finished, tables done\n");
+    mp_msg(MSGT_DECAUDIO,MSGL_V,"MP3lib: init layer2&3 finished, tables done\n");
 }
 
 #if 0