# HG changeset patch
# User reimar
# Date 1104176593 0
# Node ID 137896e25c24cf34a95acb0df82eebb33c4d3f8b
# Parent  21e72b6d8d11b7cced5757e3b7ea4c2100f278fc
100l, buf etc. in af_fmt2str call are already pointers...

diff -r 21e72b6d8d11 -r 137896e25c24 libao2/ao_alsa5.c
--- a/libao2/ao_alsa5.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/libao2/ao_alsa5.c	Mon Dec 27 19:43:13 2004 +0000
@@ -53,7 +53,7 @@
     char buf[128];
 
     mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_ALSA5_InitInfo, rate_hz,
-	channels, af_fmt2str(format));
+	channels, af_fmt2str(format, buf, 128));
 
     alsa_handler = NULL;
 
@@ -112,7 +112,7 @@
 	    ao_data.bps *= 2;
 	    break;
 	case -1:
-	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_ALSA5_InvalidFormatReq,af_fmt2str(format,&buf,128));
+	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_ALSA5_InvalidFormatReq,af_fmt2str(format,buf,128));
 	    return(0);
 	default:
 	    break;
diff -r 21e72b6d8d11 -r 137896e25c24 libao2/ao_nas.c
--- a/libao2/ao_nas.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/libao2/ao_nas.c	Mon Dec 27 19:43:13 2004 +0000
@@ -393,7 +393,7 @@
 	memset(nas_data, 0, sizeof(struct ao_nas_data));
 
 	mp_msg(MSGT_AO, MSGL_V, "ao2: %d Hz  %d chans  %s\n",rate,channels,
-		af_fmt2str(format,&buf,128));
+		af_fmt2str(format,buf,128));
 
 	ao_data.format = format;
 	ao_data.samplerate = rate;
diff -r 21e72b6d8d11 -r 137896e25c24 libao2/ao_sgi.c
--- a/libao2/ao_sgi.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/libao2/ao_sgi.c	Mon Dec 27 19:43:13 2004 +0000
@@ -43,7 +43,7 @@
 static int init(int rate, int channels, int format, int flags) {
 
   char buf[128];  
-  mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_InitInfo, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str(format, &buf, 128));
+  mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_InitInfo, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str(format, buf, 128));
   
   { /* from /usr/share/src/dmedia/audio/setrate.c */
   
diff -r 21e72b6d8d11 -r 137896e25c24 libao2/ao_sun.c
--- a/libao2/ao_sun.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/libao2/ao_sun.c	Mon Dec 27 19:43:13 2004 +0000
@@ -546,7 +546,7 @@
 
     if (!ok) {
 	mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_UnsupSampleRate,
-	       channels, af_fmt2str(format, &buf, 128), rate);
+	       channels, af_fmt2str(format, buf, 128), rate);
 	return 0;
     }
 
diff -r 21e72b6d8d11 -r 137896e25c24 libao2/pl_format.c
--- a/libao2/pl_format.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/libao2/pl_format.c	Mon Dec 27 19:43:13 2004 +0000
@@ -137,8 +137,8 @@
 
   // Tell the world what we are up to
   printf("[pl_format] Input format: %s, output format: %s \n",
-	 af_fmt2str(ao_plugin_data.format, &buf1, 128),
-	 af_fmt2str(ao_plugin_cfg.pl_format_type, &buf2, 128));
+	 af_fmt2str(ao_plugin_data.format, buf1, 128),
+	 af_fmt2str(ao_plugin_cfg.pl_format_type, buf2, 128));
 
   // We are changing the format
   ao_plugin_data.format=ao_plugin_cfg.pl_format_type;
diff -r 21e72b6d8d11 -r 137896e25c24 libmpdemux/tv.c
--- a/libmpdemux/tv.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/libmpdemux/tv.c	Mon Dec 27 19:43:13 2004 +0000
@@ -544,7 +544,7 @@
 	    case AF_FORMAT_AC3:
 	    default:
 		mp_msg(MSGT_TV, MSGL_ERR, "Audio type '%s (%x)' unsupported!\n",
-		    af_fmt2str(audio_format, &buf, 128), audio_format);
+		    af_fmt2str(audio_format, buf, 128), audio_format);
 		goto no_audio;
 	}
 	
diff -r 21e72b6d8d11 -r 137896e25c24 mplayer.c
--- a/mplayer.c	Mon Dec 27 19:34:42 2004 +0000
+++ b/mplayer.c	Mon Dec 27 19:43:13 2004 +0000
@@ -2108,7 +2108,7 @@
     char buf[128];
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"AF_pre: %dHz %dch %s\n",
       ao_data.samplerate, ao_data.channels,
-      af_fmt2str(ao_data.format,&buf,128));
+      af_fmt2str(ao_data.format, buf, 128));
   }
 #endif  
   current_module="ao2_init";
@@ -2128,7 +2128,7 @@
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bps)\n",
       audio_out->info->short_name,
       ao_data.samplerate, ao_data.channels,
-      af_fmt2str(ao_data.format, &buf, 128),
+      af_fmt2str(ao_data.format, buf, 128),
       af_fmt2bits(ao_data.format)/8 );
     mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
       audio_out->info->name, audio_out->info->author);