Mercurial > mplayer.hg
comparison mplayer.c @ 960:05088aa85610
audio_out cvs conflict fixed
author | arpi_esp |
---|---|
date | Sun, 03 Jun 2001 00:41:07 +0000 |
parents | 197ae86f68d4 |
children | 5f07e67982d6 |
comparison
equal
deleted
inserted
replaced
959:197ae86f68d4 | 960:05088aa85610 |
---|---|
570 } | 570 } |
571 if (!audio_out){ | 571 if (!audio_out){ |
572 printf("Invalid audio output driver name: %s\nUse '-ao help' to get a list of available audio drivers.\n",audio_driver); | 572 printf("Invalid audio output driver name: %s\nUse '-ao help' to get a list of available audio drivers.\n",audio_driver); |
573 return 0; | 573 return 0; |
574 } | 574 } |
575 | 575 if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,dsp); |
576 // check audio_out | |
577 audio_out=audio_out_drivers[0]; | |
578 if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,dsp); | |
579 | 576 |
580 // check codec.conf | 577 // check codec.conf |
581 if(!parse_codec_cfg(get_path("codecs.conf"))){ | 578 if(!parse_codec_cfg(get_path("codecs.conf"))){ |
582 printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n"); | 579 printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n"); |
583 GUI_MSG( mplCodecConfNotFound ) | 580 GUI_MSG( mplCodecConfNotFound ) |