RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 18:05:21 +00:00
Code Issues Releases Wiki Activity

- restore old behaviour of -channels,-srate,-format

Browse Source 
- 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
This commit is contained in:
arpi 2003-01-18 19:08:42 +00:00
parent b1956ff824
commit 1886b41ebf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mplayer.c
View File

@ -1647,7 +1647,9 @@ if(sh_audio){
current_module="ao2_init"; current_module="ao2_init";
if(!(audio_out=init_best_audio_out(audio_driver_list, if(!(audio_out=init_best_audio_out(audio_driver_list,
(ao_plugin_cfg.plugin_list!=NULL), // plugin flag (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: // FAILED:
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
uninit_player(INITED_ACODEC); // close codec uninit_player(INITED_ACODEC); // close codec
@ -1673,9 +1675,9 @@ if(sh_audio){
ao_data.samplerate, ao_data.channels, ao_data.format, ao_data.samplerate, ao_data.channels, ao_data.format,
audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */ audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */
ao_data.outburst*4, ao_data.buffersize)){ ao_data.outburst*4, ao_data.buffersize)){
mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format!\n"); mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n");
// uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
// sh_audio=d_audio->sh=NULL; // -> nosound sh_audio=d_audio->sh=NULL; // -> nosound
} }
#endif #endif
} }