big cosmetics patch, cleanup of messages printed by mplayer and libs.

some printf->mp_msg conversion, and some debug messages moved from warn/info to v/dbg2
mplayer's output is now shorter, readable and consistent


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6139 b3059339-0415-0410-9bf9-f77b7e298cf2

17 files changed, 70 insertions, 74 deletions

diff --git a/configure b/configure
index 50928615f3..e231d449e1 100755
--- a/configure
+++ b/configure
@@ -3734,6 +3734,9 @@ STATIC_LIB = $_ld_static
 X11_INC = $_inc_x11
 X11DIR = $_ld_x11
 
+# for libavcodec:
+SRC_PATH=.
+
 # video output
 X_LIB = $_ld_x11 $_ld_gl $_ld_dga $_ld_xv $_ld_vm $_ld_xinerama $_ld_mad $_ld_sock
 GGI_LIB = $_ld_ggi
diff --git a/input/input.c b/input/input.c
index e8c9f419e9..100a36c5bd 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1236,7 +1236,7 @@ mp_input_init(void) {
     return;
   
   if(! mp_input_parse_config(file))
-    mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) config\n");
+    mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n");
 
 #ifdef HAVE_JOYSTICK
   if(use_joystick) {
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index f818beff6d..96170eccd8 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -91,6 +91,7 @@ static int control(int cmd,int arg){
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags){
 
+  if (verbose)
   printf("ao2: %d Hz  %d chans  %s\n",rate,channels,
     audio_out_format_name(format));
 
@@ -109,14 +110,14 @@ static int init(int rate,int channels,int format,int flags){
   audio_fd=open(dsp, O_WRONLY);
 #endif
   if(audio_fd<0){
-    printf("Can't open audio device %s: %s  -> no sound\n", dsp, strerror(errno));
+    printf("Can't open audio device %s: %s\n", dsp, strerror(errno));
     return 0;
   }
 
 #ifdef __linux__
   /* Remove the non-blocking flag */
   if(fcntl(audio_fd, F_SETFL, 0) < 0) {
-   printf("Can't make filedescriptor non-blocking: %s -> no sound\n", strerror(errno));
+   printf("Can't make filedescriptor non-blocking: %s\n", strerror(errno));
    return 0;
   }  
 #endif
diff --git a/libmpcodecs/ad_mp3.c b/libmpcodecs/ad_mp3.c
index 57309a34bf..e4b8f9c4bc 100644
--- a/libmpcodecs/ad_mp3.c
+++ b/libmpcodecs/ad_mp3.c
@@ -46,6 +46,7 @@ static int init(sh_audio_t *sh)
 #endif
   MP3_samplerate=MP3_channels=0;
   sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1);
+  if(!sh->a_buffer_len) return 0; // unsupported layer/format
   sh->channels=2; // hack
   sh->samplerate=MP3_samplerate;
   sh->i_bps=MP3_bitrate*(1000/8);
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index 333c4d6c15..aa6a491f1d 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -39,7 +39,7 @@ int init_audio(sh_audio_t *sh_audio)
       return 0; // no such driver
   }
   
-  mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Selecting Audio Decoder: [%s] %s\n",mpadec->info->short_name,mpadec->info->name);
+  mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Opening audio decoder: [%s] %s\n",mpadec->info->short_name,mpadec->info->name);
 
   // reset in/out buffer size/pointer:
   sh_audio->a_buffer_size=0;
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index 5978b0b50c..103e25f0d3 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -60,7 +60,7 @@ int get_video_quality_max(sh_video_t *sh_video){
       return ret;
     }
   }
-  mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[PP] Sorry, postprocessing is not available\n");
+//  mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[PP] Sorry, postprocessing is not available\n");
   return 0;
 }
 
@@ -157,7 +157,7 @@ int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status){
 	    continue;
 	}
 	// it's available, let's try to init!
-	mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Opening Video Decoder: [%s] %s\n",mpvdec->info->short_name,mpvdec->info->name);
+	mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Opening video decoder: [%s] %s\n",mpvdec->info->short_name,mpvdec->info->name);
 	if(!mpvdec->init(sh_video)){
 	    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDecoder init failed :(\n");
 	    continue; // try next...
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 6739809d4d..42f34bc227 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -135,7 +135,7 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outf
         sh->disp_h=h;
 #endif
 
-    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d, %s  \n",
+    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d (preferred csp: %s)  \n",
 	w,h,vo_format_name(preferred_outfmt));
 
 //    if(!vf) return 1; // temp hack
@@ -233,24 +233,6 @@ csp_again:
     }
   }
 
-#if 0
-  if(video_out->get_info)
-  { const vo_info_t *info = video_out->get_info();
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
-         sh->disp_w,sh->disp_h,
-         screen_size_x,screen_size_y,
-	 vo_format_name(out_fmt),
-         fullscreen?"fs ":"",
-         vidmode?"vm ":"",
-         softzoom?"zoom ":"",
-         (flip==1)?"flip ":"");
-    mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
-    mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
-    if(info->comment && strlen(info->comment) > 0)
-        mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
-  }
-#endif
-
     // Time to config libvo!
     mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
                       sh->disp_w,sh->disp_h,
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index da53f93fe5..3fa0d60fea 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -81,7 +81,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
     for(y=y0;y<y0+h;y++){
 	unsigned char* dst=mpi->planes[0]+mpi->stride[0]*y+(mpi->bpp>>3)*x0;
 	if(mpi->flags&MP_IMGFLAG_YUV){
-	    unsigned int* p=dst;
+	    unsigned int* p=(unsigned int*) dst;
 	    int size=(mpi->bpp>>3)*w/4;
 	    int i;
 	    if(mpi->flags&MP_IMGFLAG_SWAPPED){
@@ -176,7 +176,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
         }
     }
     if(!(mpi->flags&MP_IMGFLAG_TYPE_DISPLAYED)){
-	    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"*** [%s] %s mp_image_t, %dx%dx%dbpp %s %s, %d bytes\n",
+	    mp_msg(MSGT_DECVIDEO,MSGL_V,"*** [%s] %s mp_image_t, %dx%dx%dbpp %s %s, %d bytes\n",
 		  vf->info->name,
 		  (mpi->type==MP_IMGTYPE_EXPORT)?"Exporting":
 	          ((mpi->flags&MP_IMGFLAG_DIRECT)?"Direct Rendering":"Allocating"),
@@ -220,6 +220,10 @@ vf_instance_t* vf_open_plugin(vf_info_t** filter_list, vf_instance_t* next, char
 }
 
 vf_instance_t* vf_open_filter(vf_instance_t* next, char *name, char *args){
+    if(strcmp(name,"vo"))
+    mp_msg(MSGT_VFILTER,MSGL_INFO,
+	args ? "Opening video filter: [%s=%s]\n"
+	     : "Opening video filter: [%s]\n" ,name,args);
     return vf_open_plugin(filter_list,next,name,args);
 }
 
@@ -275,7 +279,7 @@ int vf_next_config(struct vf_instance_s* vf,
 	    return 0; // FAIL
 	}
     }
-    printf("REQ: flags=0x%X  req=0x%X  \n",flags,vf->default_reqs);
+    mp_msg(MSGT_VFILTER,MSGL_V,"REQ: flags=0x%X  req=0x%X  \n",flags,vf->default_reqs);
     miss=vf->default_reqs - (flags&vf->default_reqs);
     if(miss&VFCAP_ACCEPT_STRIDE){
 	// vf requires stride support but vf->next doesn't support it!
@@ -311,7 +315,6 @@ vf_instance_t* append_filters(vf_instance_t* last){
 	char* name=strdup(*plugin_args);
 	char* args=strchr(name,'=');
 	if(args){args[0]=0;++args;}
-	mp_msg(MSGT_VFILTER,MSGL_INFO,"Opening video filter '%s' with args '%s'...\n",name,args);
 	vf=vf_open_filter(last,name,args);
 	if(vf) last=vf;
 	free(name);
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 38fc5d61de..6813f28a80 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -56,7 +56,7 @@ static int config(struct vf_instance_s* vf,
     int vo_flags;
     
     if(!best){
-	printf("SwScale: no supported outfmt found :(\n");
+	mp_msg(MSGT_VFILTER,MSGL_WARN,"SwScale: no supported outfmt found :(\n");
 	return 0;
     }
     
@@ -95,7 +95,7 @@ static int config(struct vf_instance_s* vf,
     if(vf->priv->h<0) vf->priv->h=height; else
     if(vf->priv->h==0) vf->priv->h=d_height;
     
-    printf("SwScale scaling %dx%d %s to %dx%d %s  \n",
+    mp_msg(MSGT_VFILTER,MSGL_DBG2,"SwScale: scaling %dx%d %s to %dx%d %s  \n",
 	width,height,vo_format_name(outfmt),
 	vf->priv->w,vf->priv->h,vo_format_name(best));
 
@@ -109,7 +109,7 @@ static int config(struct vf_instance_s* vf,
 	    (best==IMGFMT_I420 || best==IMGFMT_IYUV)?IMGFMT_YV12:best);
     if(!vf->priv->ctx){
 	// error...
-	printf("Couldn't init SwScaler for this setup\n");
+	mp_msg(MSGT_VFILTER,MSGL_WARN,"Couldn't init SwScaler for this setup\n");
 	return 0;
     }
     vf->priv->fmt=best;
@@ -184,7 +184,7 @@ static int open(vf_instance_t *vf, char* args){
     if(args) sscanf(args, "%d:%d",
     &vf->priv->w,
     &vf->priv->h);
-    printf("SwScale: %d x %d (-1=no scaling)\n",
+    mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n",
     vf->priv->w,
     vf->priv->h);
     return 1;
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index e255c3498d..69d4c0308d 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -24,10 +24,10 @@ static int config(struct vf_instance_s* vf,
          width, height,
          d_width, d_height,
 	 vo_format_name(outfmt),
-         (flags&1)?"fs ":"",
-         (flags&2)?"vm ":"",
-         (flags&4)?"zoom ":"",
-         (flags&8)?"flip ":"");
+         (flags&1)?" [fs]":"",
+         (flags&2)?" [vm]":"",
+         (flags&4)?" [zoom]":"",
+         (flags&8)?" [flip]":"");
     mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
     mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
     if(info->comment && strlen(info->comment) > 0)
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 8b0ab921fb..d8c4205364 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -156,7 +156,7 @@ while(1){
       stream_read(demuxer->stream,(char*) &avih,MIN(size2,sizeof(avih)));
       le2me_MainAVIHeader(&avih); // swap to machine endian
       chunksize-=MIN(size2,sizeof(avih));
-      if(verbose) print_avih(&avih); else print_avih_flags(&avih);
+      if(verbose) print_avih(&avih); // else print_avih_flags(&avih);
       break;
     case ckidSTREAMHEADER: {      // read 'strh'
       AVIStreamHeader h;
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index edbb662229..871b0b34f5 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -253,7 +253,7 @@ stream_t* new_stream(int fd,int type){
 }
 
 void free_stream(stream_t *s){
-  printf("\n*** free_stream() called ***\n");
+//  printf("\n*** free_stream() called ***\n");
   if(s->cache_pid) {
 //    kill(s->cache_pid,SIGTERM);
     kill(s->cache_pid,SIGKILL);
diff --git a/loader/module.c b/loader/module.c
index 41393f5e34..30029d6aae 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -408,7 +408,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
 	else
 	{
 	    extern char *win32_codec_name;
-	    printf("Loaded %s to address %p\n", libname, wm->module);
+//	    printf("Loaded %s to address %p\n", libname, wm->module);
 	    /* XXX: FIXME, _VERY_ UGLY HACK */
 	    if (!strcmp(libname, "m3jpegdec.ax"))
 		win32_codec_name = strdup("m3jpeg32.dll");
diff --git a/mencoder.c b/mencoder.c
index a5440f28c1..7827c57950 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -637,8 +637,8 @@ if(!sh_video->inited){
     mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
     mencoder_exit(1,NULL);
 }
-mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n",
-    video_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info);
+mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d (%s)\n",
+    video_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
 
 }
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 3bdd4b375a..c3716b0626 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -27,6 +27,7 @@
 #include "bswap.h"
 #include "../cpudetect.h"
 #include "../liba52/mm_accel.h"
+#include "../mp_msg.h"
 
 #include "fastmemcpy.h"
 
@@ -400,7 +401,7 @@ void MP3_Init(){
     {
 	_has_mmx = 1;
 	make_decode_tables_MMX(outscale);
-	printf("mp3lib: made decode tables with MMX optimization\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: made decode tables with MMX optimization\n");
     }
     else
 	make_decode_tables(outscale);
@@ -426,7 +427,7 @@ void MP3_Init(){
     tables_done_flag = 1;
 
     dct36_func = dct36;
-    printf("init layer2&3 finished, tables done\n");
+    mp_msg(MSGT_DECAUDIO,MSGL_V,"init layer2&3 finished, tables done\n");
 
 #ifdef CAN_COMPILE_X86_ASM
 #if 0
@@ -435,7 +436,7 @@ void MP3_Init(){
 	/* SSE version is buggy */
 	synth_func = synth_1to1_MMX;
 	dct64_MMX_func = dct64_MMX_sse;
-	printf("mp3lib: using SSE optimized decore!\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n");
     }
     else
 #endif
@@ -444,7 +445,7 @@ void MP3_Init(){
 	synth_func=synth_1to1_MMX;
 	dct36_func=dct36_3dnowex;
 	dct64_MMX_func=dct64_MMX_3dnowex;
-	printf("mp3lib: using 3DNow!Ex optimized decore!\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow!Ex optimized decore!\n");
     }
     else
     if (accel & MM_ACCEL_X86_3DNOW)
@@ -452,29 +453,29 @@ void MP3_Init(){
 	synth_func = synth_1to1_MMX;
 	dct36_func = dct36_3dnow;
 	dct64_MMX_func = dct64_MMX_3dnow;
-	printf("mp3lib: using 3DNow! optimized decore!\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow! optimized decore!\n");
     }
     else
     if (accel & MM_ACCEL_X86_MMX)
     {
         synth_func = synth_1to1_MMX;
 	dct64_MMX_func = dct64_MMX;
-	printf("mp3lib: using MMX optimized decore!\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using MMX optimized decore!\n");
     }
     else
     if (gCpuCaps.cpuType >= CPUTYPE_I586)
     {
 	synth_func = synth_1to1_pent;
-	printf("mp3lib: using Pentium optimized decore!\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using Pentium optimized decore!\n");
     }
     else
     {
 	synth_func = NULL; /* use default c version */
-	printf("mp3lib: using generic decore!\n");
+	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using generic C decore!\n");
     }
 #else /* CAN_COMPILE_X86_ASM */
     synth_func = NULL;
-    printf("mp3lib: using generic decore!\n");
+    mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using generic C decore!\n");
 #endif
 
 #ifdef USE_FAKE_MONO
@@ -538,6 +539,8 @@ int MP3_DecodeFrame(unsigned char *hova,short single){
    switch(fr.lay){
      case 2: do_layer2(&fr,single);break;
      case 3: do_layer3(&fr,single);break;
+     default:
+         return 0;	// unsupported
    }
 //   ++MP3_frames;
    return(pcm_point?pcm_point:2);
@@ -548,12 +551,12 @@ void MP3_PrintHeader(){
         static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" };
         static char *layers[4] = { "???" , "I", "II", "III" };
 
-        printf("\rMPEG %s, Layer %s, %ld Hz %d kbit %s, BPF: %ld\n",
+        mp_msg(MSGT_DECAUDIO,MSGL_V,"\rMPEG %s, Layer %s, %ld Hz %d kbit %s, BPF: %ld\n",
                 fr.mpeg25 ? "2.5" : (fr.lsf ? "2.0" : "1.0"),
                 layers[fr.lay],freqs[fr.sampling_frequency],
     tabsel_123[fr.lsf][fr.lay-1][fr.bitrate_index],
                 modes[fr.mode],fr.framesize+4);
-        printf("Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d\n",
+        mp_msg(MSGT_DECAUDIO,MSGL_V,"Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d\n",
                 fr.stereo,fr.copyright?"Yes":"No",
                 fr.original?"Yes":"No",fr.error_protection?"Yes":"No",
                 fr.emphasis);
diff --git a/mplayer.c b/mplayer.c
index 315013af08..62c55848c3 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -859,6 +859,7 @@ if(!use_stdin && !slave_mode){
 #endif
 //---------------------------------------------------------------------------
 
+    mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
     if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
 
 //==================== Open VOB-Sub ============================
@@ -1128,7 +1129,7 @@ if(sh_video){
     mp_msg(MSGT_CPLAYER,MSGL_ERR,"Video: can't read properties\n");
     sh_video=d_video->sh=NULL;
   } else {
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d  fourcc:0x%X  size:%dx%d  fps:%5.2f  ftime:=%6.4f\n",
+    mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d  fourcc:0x%X  size:%dx%d  fps:%5.2f  ftime:=%6.4f\n",
 	   demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
 	   sh_video->fps,sh_video->frametime
 	   );
@@ -1238,7 +1239,7 @@ if(sh_audio){
     }
     if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue;
     else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue;
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s audio codec: [%s] drv:%d (%s)\n",
+    mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s audio codec: [%s] afm:%d (%s)\n",
 	audio_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
     break;
   }
@@ -1252,8 +1253,10 @@ if(sh_audio){
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
     sh_audio=d_audio->sh=NULL;
   } else {
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"AUDIO: srate=%d  chans=%d  bps=%d  sfmt=0x%X  ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize,
-        sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
+    mp_msg(MSGT_CPLAYER,MSGL_INFO,"AUDIO: %d Hz, %d ch, sfmt: 0x%X (%d bps), ratio: %d->%d (%3.1f kbit)\n",
+	sh_audio->samplerate,sh_audio->channels,
+	sh_audio->sample_format,sh_audio->samplesize,
+        sh_audio->i_bps,sh_audio->o_bps,sh_audio->i_bps*8*0.001);
   }
 }
 
@@ -1309,8 +1312,8 @@ if(!sh_video->inited){
     goto main; // exit_player(MSGTR_Exit_error);
 }
 
-mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n",
-    video_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info);
+mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] vfm:%d (%s)\n",
+    video_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
 
 if(auto_quality>0){
@@ -1399,10 +1402,10 @@ osd_text_buffer[0]=0;
 if(sh_audio){
   const ao_info_t *info=audio_out->info;
   current_module="setup_audio";
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n",
+  mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %dch %s\n",
       info->short_name,
       force_srate?force_srate:sh_audio->samplerate,
-      sh_audio->channels>1?"Stereo":"Mono",
+      sh_audio->channels,
       audio_out_format_name(sh_audio->sample_format)
   );
   mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
@@ -2963,6 +2966,8 @@ mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",eof);
 
 goto_next_file:  // don't jump here after ao/vo/getch initialization!
 
+mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
+
 if(benchmark){
   double tot=video_time_usage+vout_time_usage+audio_time_usage;
   double total_time_usage;
diff --git a/postproc/swscale.c b/postproc/swscale.c
index a602de0076..43553f8d59 100644
--- a/postproc/swscale.c
+++ b/postproc/swscale.c
@@ -1723,26 +1723,24 @@ SwsContext *getSwsContext(int srcW, int srcH, int srcFormat, int dstW, int dstH,
 		char *dither= "";
 #endif
 		if(flags&SWS_FAST_BILINEAR)
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: FAST_BILINEAR scaler, ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: FAST_BILINEAR scaler, ");
 		else if(flags&SWS_BILINEAR)
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: BILINEAR scaler, ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: BILINEAR scaler, ");
 		else if(flags&SWS_BICUBIC)
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: BICUBIC scaler, ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: BICUBIC scaler, ");
 		else if(flags&SWS_X)
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: Experimental scaler, ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: Experimental scaler, ");
 		else if(flags&SWS_POINT)
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: Nearest Neighbor / POINT scaler, ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: Nearest Neighbor / POINT scaler, ");
 		else if(flags&SWS_AREA)
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: Area Averageing scaler, ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: Area Averageing scaler, ");
 		else
-			mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: ehh flags invalid?! ");
+			mp_msg(MSGT_SWS,MSGL_INFO,"SwScaler: ehh flags invalid?! ");
 
-		if(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16)
-			mp_msg(MSGT_SWS,MSGL_INFO,"from %s to%s %s ", 
-				vo_format_name(srcFormat), dither, vo_format_name(dstFormat));
-		else
-			mp_msg(MSGT_SWS,MSGL_INFO,"from %s to %s ", 
-				vo_format_name(srcFormat), vo_format_name(dstFormat));
+		mp_msg(MSGT_SWS,MSGL_INFO,"%dx%d %s -> %dx%d%s %s ", 
+			srcW,srcH, vo_format_name(srcFormat), dstW,dstH,
+			(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16) ?
+			dither : "", vo_format_name(dstFormat));
 
 		if(cpuCaps.hasMMX2)
 			mp_msg(MSGT_SWS,MSGL_INFO,"using MMX2\n");