diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-18 19:08:42 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-18 19:08:42 +0000 |
commit | 1886b41ebf02def478fd2893ec7d529e137c56ea (patch) | |
tree | c6b82b6d3e24b49d4b9aa3d18a09fc1b48482e0e /mplayer.c | |
parent | b1956ff8245b53ef791747294d7bdc667c389a23 (diff) | |
download | mpv-1886b41ebf02def478fd2893ec7d529e137c56ea.tar.bz2 mpv-1886b41ebf02def478fd2893ec7d529e137c56ea.tar.xz |
- restore old behaviour of -channels,-srate,-format
- disable audio if libaf init failed (to avoid sig11 in decoder)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8997 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1647,7 +1647,9 @@ if(sh_audio){ current_module="ao2_init"; if(!(audio_out=init_best_audio_out(audio_driver_list, (ao_plugin_cfg.plugin_list!=NULL), // plugin flag - ao_data.samplerate, ao_data.channels, ao_data.format,0))){ + force_srate?force_srate:ao_data.samplerate, + audio_output_channels?audio_output_channels:ao_data.channels, + audio_output_format?audio_output_format:ao_data.format,0))){ // FAILED: mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); uninit_player(INITED_ACODEC); // close codec @@ -1673,9 +1675,9 @@ if(sh_audio){ ao_data.samplerate, ao_data.channels, ao_data.format, audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */ ao_data.outburst*4, ao_data.buffersize)){ - mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format!\n"); -// uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao -// sh_audio=d_audio->sh=NULL; // -> nosound + mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); + uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao + sh_audio=d_audio->sh=NULL; // -> nosound } #endif } |