RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-29 15:00:27 +00:00
Code Issues Releases Wiki Activity

audio_out cvs conflict fixed

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@961 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-06-03 00:41:07 +00:00
parent dbac43a765
commit 7bbe7c90be
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mplayer.c
View File

@ -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"))){