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	7 Oct 2004 00:57:38 -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
Index: libmpdemux/aviprint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviprint.c,v
retrieving revision 1.19
diff -u -r1.19 aviprint.c
--- libmpdemux/aviprint.c	28 Apr 2004 10:18:33 -0000	1.19
+++ libmpdemux/aviprint.c	7 Oct 2004 01:08:06 -0000
@@ -54,32 +54,32 @@
 }
 
 void print_wave_header(WAVEFORMATEX *h){
-  printf("======= WAVE Format =======\n");
-  printf("Format Tag: %d (0x%X)\n",h->wFormatTag,h->wFormatTag);
-  printf("Channels: %d\n",h->nChannels);
-  printf("Samplerate: %ld\n",h->nSamplesPerSec);
-  printf("avg byte/sec: %ld\n",h->nAvgBytesPerSec);
-  printf("Block align: %d\n",h->nBlockAlign);
-  printf("bits/sample: %d\n",h->wBitsPerSample);
-  printf("cbSize: %d\n",h->cbSize);
+  mp_msg(MSGT_HEADER, MSGL_V, "======= WAVE Format =======\n");
+  mp_msg(MSGT_HEADER, MSGL_V, "Format Tag: %d (0x%X)\n",h->wFormatTag,h->wFormatTag);
+  mp_msg(MSGT_HEADER, MSGL_V, "Channels: %d\n",h->nChannels);
+  mp_msg(MSGT_HEADER, MSGL_V, "Samplerate: %ld\n",h->nSamplesPerSec);
+  mp_msg(MSGT_HEADER, MSGL_V, "avg byte/sec: %ld\n",h->nAvgBytesPerSec);
+  mp_msg(MSGT_HEADER, MSGL_V, "Block align: %d\n",h->nBlockAlign);
+  mp_msg(MSGT_HEADER, MSGL_V, "bits/sample: %d\n",h->wBitsPerSample);
+  mp_msg(MSGT_HEADER, MSGL_V, "cbSize: %d\n",h->cbSize);
   if(h->wFormatTag==0x55 && h->cbSize>=12){
       MPEGLAYER3WAVEFORMAT* h2=(MPEGLAYER3WAVEFORMAT *)h;
-      printf("mp3.wID=%d\n",h2->wID);
-      printf("mp3.fdwFlags=0x%lX\n",h2->fdwFlags);
-      printf("mp3.nBlockSize=%d\n",h2->nBlockSize);
-      printf("mp3.nFramesPerBlock=%d\n",h2->nFramesPerBlock);
-      printf("mp3.nCodecDelay=%d\n",h2->nCodecDelay);
+      mp_msg(MSGT_HEADER, MSGL_V, "mp3.wID=%d\n",h2->wID);
+      mp_msg(MSGT_HEADER, MSGL_V, "mp3.fdwFlags=0x%lX\n",h2->fdwFlags);
+      mp_msg(MSGT_HEADER, MSGL_V, "mp3.nBlockSize=%d\n",h2->nBlockSize);
+      mp_msg(MSGT_HEADER, MSGL_V, "mp3.nFramesPerBlock=%d\n",h2->nFramesPerBlock);
+      mp_msg(MSGT_HEADER, MSGL_V, "mp3.nCodecDelay=%d\n",h2->nCodecDelay);
   }
   else if (h->cbSize > 0)
   {
     int i;
     uint8_t* p = ((uint8_t*)h) + sizeof(WAVEFORMATEX);
-    printf("Unknown extra header dump: ");
+    mp_msg(MSGT_HEADER, MSGL_V, "Unknown extra header dump: ");
     for (i = 0; i < h->cbSize; i++)
-	printf("[%x] ", p[i]);
-    printf("\n");
+	mp_msg(MSGT_HEADER, MSGL_V, "[%x] ", p[i]);
+    mp_msg(MSGT_HEADER, MSGL_V, "\n");
   }
-  printf("===========================\n");
+  mp_msg(MSGT_HEADER, MSGL_V, "==========================================================================\n");
 }
 
 
Index: libmpdemux/demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.108
diff -u -r1.108 demux_mov.c
--- libmpdemux/demux_mov.c	13 Sep 2004 21:21:47 -0000	1.108
+++ libmpdemux/demux_mov.c	7 Oct 2004 01:08:07 -0000
@@ -156,7 +156,7 @@
     }
 #endif
 
-    mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV track #%d: %d chunks, %d samples\n",trak->id,trak->chunks_size,trak->samples_size);
+    mp_msg(MSGT_DEMUX, MSGL_V, "MOV track #%d: %d chunks, %d samples\n",trak->id,trak->chunks_size,trak->samples_size);
     mp_msg(MSGT_DEMUX, MSGL_V, "pts=%d  scale=%d  time=%5.3f\n",trak->length,trak->timescale,(float)trak->length/(float)trak->timescale);
 
     // process chunkmap:
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.793
diff -u -r1.793 mplayer.c
--- mplayer.c	7 Oct 2004 00:14:22 -0000	1.793
+++ mplayer.c	7 Oct 2004 01:10:08 -0000
@@ -803,7 +803,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
@@ -966,34 +966,28 @@
     if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
       list_codecs(1);
-      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
       list_codecs(0);
-      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(video_fm_list && strcmp(video_fm_list[0],"help")==0){
       vfm_help();
-      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(audio_fm_list && strcmp(audio_fm_list[0],"help")==0){
       afm_help();
-      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(af_cfg.list && strcmp(af_cfg.list[0],"help")==0){
       af_help();
-      printf("\n");
       exit_player_with_rc(NULL, 0);
     }
 #ifdef HAVE_X11
     if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
       fstype_help();
-      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
 #endif
@@ -1115,7 +1109,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
@@ -1262,7 +1256,6 @@
 #endif
 //---------------------------------------------------------------------------
 
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
     if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
 
 //==================== Open VOB-Sub ============================
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.255
diff -u -r1.255 mencoder.c
--- mencoder.c	7 Oct 2004 00:14:22 -0000	1.255
+++ mencoder.c	7 Oct 2004 01:10:09 -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);
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.89
diff -u -r1.89 cfg-mencoder.h
--- cfg-mencoder.h	21 Sep 2004 19:45:49 -0000	1.89
+++ cfg-mencoder.h	7 Oct 2004 01:12:08 -0000
@@ -87,7 +87,7 @@
 	{"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL},
 	{"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, NULL},
 	{"x264", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_X264, NULL},
-	{"help", "\nAvailable codecs:\n"
+	{"help", "Available codecs:\n"
 	"   copy     - frame copy, without re-encoding. Doesn't work with filters.\n"
 	"   frameno  - special audio-only file for 3-pass encoding, see DOCS.\n"
 	"   raw      - uncompressed video. Use fourcc option to set format explicitly.\n"
@@ -137,7 +137,7 @@
 #else
 	{"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
-	{"help", "\nAvailable codecs:\n"
+	{"help", "Available codecs:\n"
 	"   copy     - frame copy, without re-encoding (useful for AC3)\n"
 	"   pcm      - uncompressed PCM audio\n"
 #ifdef HAVE_MP3LAME
@@ -161,7 +161,7 @@
 	{"copyright", &info_copyright, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"srcform", &info_sourceform, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"comment", &info_comment, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"help", "\nAvailable INFO fields:\n"
+	{"help", "Available INFO fields:\n"
 	"   name      - title of the work\n"
 	"   artist    - artist or author of the work\n"
 	"   genre     - original work category\n"
@@ -177,7 +177,7 @@
 	{"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL},
 	{"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL},
 	{"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL},
-	{"help", "\nAvailable output formats:\n"
+	{"help", "Available output formats:\n"
 	"   avi      - Microsoft Audio/Video Interleaved\n"
 	"   mpeg     - MPEG-1 system stream format\n"
 	"   rawvideo - (video only, one stream only) raw stream, no muxing\n"
Index: libvo/x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.176
diff -u -r1.176 x11_common.c
--- libvo/x11_common.c	8 Aug 2004 23:22:04 -0000	1.176
+++ libvo/x11_common.c	9 Oct 2004 19:44:40 -0000
@@ -1626,7 +1627,7 @@
                 DPMSInfo(mDisplay, &state, &onoff);
                 if (onoff)
                 {
-                    mp_msg(MSGT_VO, MSGL_INFO,
+                    mp_msg(MSGT_VO, MSGL_V,
                            "Successfully enabled DPMS\n");
                 } else
                 {