[MPlayer-cvslog] CVS: main mplayer.c,1.841,1.842

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv13580

Modified Files:
	mplayer.c 
Log Message:
Apply -srate and -channels only to the start of the filter chain, not
to both start and end (made downmixing to 2 channels impossible).


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- mplayer.c	15 Apr 2005 12:14:24 -0000	1.841
+++ mplayer.c	22 Apr 2005 18:28:10 -0000	1.842
@@ -2143,9 +2143,9 @@
   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