diff --git a/cfg-mplayer.h b/cfg-mplayer.h index d0601584e2..56d0279abd 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -46,7 +46,8 @@ struct config conf[]={ CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, {"ao", &audio_driver, CONF_TYPE_STRING, 0, 0, 0}, - {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, +// {"dsp", &dsp, CONF_TYPE_STRING, CONF_NOCFG, 0, 0}, + {"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0}, {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1}, #ifdef HAVE_X11 @@ -181,4 +182,3 @@ struct config conf[]={ {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {NULL, NULL, 0, 0, 0, 0} }; - diff --git a/mplayer.c b/mplayer.c index 7063e6e592..578054dfc4 100644 --- a/mplayer.c +++ b/mplayer.c @@ -370,7 +370,7 @@ char *sub_name=NULL; float sub_delay=0; float sub_fps=0; int sub_auto = 1; -char *dsp=NULL; +/*DSP!!char *dsp=NULL;*/ float rel_seek_secs=0; @@ -627,7 +627,7 @@ if(!filename){ fprintf(stderr,"Invalid audio output driver name: %s\nUse '-ao help' to get a list of available audio drivers.\n",audio_driver); return 0; } - if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp); +/*DSP!! if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);*/ // check codec.conf if(!parse_codec_cfg(get_path("codecs.conf"))){ @@ -806,6 +806,18 @@ if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above! printf("Detected MPEG-ES file format!\n"); } } +#ifdef MOV +//=============== Try to open as MOV file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ + stream_reset(stream); + demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); +// stream_seek(demuxer->stream,seek_to_byte); + if(mov_check_file(demuxer)){ + printf("Detected MOV file format!\n"); + file_format=DEMUXER_TYPE_MOV; + } +} +#endif //=============== Unknown, exiting... =========================== if(file_format==DEMUXER_TYPE_UNKNOWN){ fprintf(stderr,"============= Sorry, this file format not recognized/supported ===============\n");