diff options
-rw-r--r-- | libao2/ao_alsa5.c | 4 | ||||
-rw-r--r-- | libao2/ao_nas.c | 2 | ||||
-rw-r--r-- | libao2/ao_sgi.c | 2 | ||||
-rw-r--r-- | libao2/ao_sun.c | 2 | ||||
-rw-r--r-- | libao2/pl_format.c | 4 | ||||
-rw-r--r-- | libmpdemux/tv.c | 2 | ||||
-rw-r--r-- | mplayer.c | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c index 687b48ac8c..02c894d892 100644 --- a/libao2/ao_alsa5.c +++ b/libao2/ao_alsa5.c @@ -53,7 +53,7 @@ static int init(int rate_hz, int channels, int format, int flags) 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 @@ static int init(int rate_hz, int channels, int format, int flags) 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 --git a/libao2/ao_nas.c b/libao2/ao_nas.c index 17ed4bf0b3..57f2c3e584 100644 --- a/libao2/ao_nas.c +++ b/libao2/ao_nas.c @@ -393,7 +393,7 @@ static int init(int rate,int channels,int format,int flags) 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 --git a/libao2/ao_sgi.c b/libao2/ao_sgi.c index 796691ab4e..66a0b0dffd 100644 --- a/libao2/ao_sgi.c +++ b/libao2/ao_sgi.c @@ -43,7 +43,7 @@ static int control(int cmd, void *arg){ 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 --git a/libao2/ao_sun.c b/libao2/ao_sun.c index 2e102ccfa1..b5824e9b97 100644 --- a/libao2/ao_sun.c +++ b/libao2/ao_sun.c @@ -546,7 +546,7 @@ static int init(int rate,int channels,int format,int flags){ 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 --git a/libao2/pl_format.c b/libao2/pl_format.c index 46ddaaa6a6..6c0921179f 100644 --- a/libao2/pl_format.c +++ b/libao2/pl_format.c @@ -137,8 +137,8 @@ static int init(){ // 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 --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 706949b34b..13fdb269e1 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -544,7 +544,7 @@ int demux_open_tv(demuxer_t *demuxer) 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; } @@ -2108,7 +2108,7 @@ if(sh_audio){ 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 @@ if(sh_audio){ 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); |