Mercurial > mplayer.hg

changeset 15241:690f76d3bfc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Apply -srate and -channels only to the start of the filter chain, not to both start and end (made downmixing to 2 channels impossible).
author reimar
date Fri, 22 Apr 2005 18:28:10 +0000
parents 6d6792c02b6f
children f27a3f8d3241
files mplayer.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Apr 22 17:53:31 2005 +0000
+++ b/mplayer.c	Fri Apr 22 18:28:10 2005 +0000
@@ -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