Apply -srate and -channels only to the start of the filter chain, not

to both start and end (made downmixing to 2 channels impossible).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15242 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 3 insertions, 3 deletions

diff --git a/mplayer.c b/mplayer.c
index 650e2397c7..a317717ff9 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2143,9 +2143,9 @@ if(sh_audio){
   current_module="ao2_init";
   if(!(audio_out=init_best_audio_out(audio_driver_list,
       0, // plugin flag
-      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))){
+      ao_data.samplerate,
+      ao_data.channels,
+      ao_data.format,0))){
     // FAILED:
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
     uninit_player(INITED_ACODEC); // close codec