Mercurial > mplayer.hg

changeset 960:05088aa85610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
audio_out cvs conflict fixed
author arpi_esp
date Sun, 03 Jun 2001 00:41:07 +0000
parents 197ae86f68d4
children 8618658d3ef8
files mplayer.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Sun Jun 03 00:34:15 2001 +0000
+++ b/mplayer.c	Sun Jun 03 00:41:07 2001 +0000
@@ -572,10 +572,7 @@
     printf("Invalid audio output driver name: %s\nUse '-ao help' to get a list of available audio drivers.\n",audio_driver);
     return 0;
   }
-
-// check audio_out
-audio_out=audio_out_drivers[0];
-if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,dsp);
+  if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,dsp);
 
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){