diff options
| author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-03 00:41:07 +0000 |
|---|---|---|
| committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-03 00:41:07 +0000 |
| commit | 7bbe7c90beac199a8553111a8b4121ce3b04c705 (patch) | |
| tree | e17ca75b7d9eb6be31472c459ab918e519c66222 /mplayer.c | |
| parent | dbac43a765aa0be146376407b02b5792d31535cc (diff) | |
| download | mpv-7bbe7c90beac199a8553111a8b4121ce3b04c705.tar.bz2 mpv-7bbe7c90beac199a8553111a8b4121ce3b04c705.tar.xz | |
audio_out cvs conflict fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@961 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -572,10 +572,7 @@ if(!filename){ 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"))){ |