github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-18 10:25:02 +02:00
Code Releases Activity

100l, buf etc. in af_fmt2str call are already pointers...

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14256 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-12-27 19:43:13 +00:00
parent 0fdaa5ab30
commit 91aae0d538
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libao2/ao_alsa5.c
View File

@ -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;

2
libao2/ao_nas.c
View File

@ -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;

2
libao2/ao_sgi.c
View File

@ -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 */

2
libao2/ao_sun.c
View File

@ -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;
}

4
libao2/pl_format.c
View File

@ -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;

2
libmpdemux/tv.c
View File

@ -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;
}

4
mplayer.c
View File

@ -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);