Update of /cvsroot/mplayer/main In directory mplayerhq:/var/tmp.root/cvs-serv22962 Modified Files: mplayer.c cfg-mplayer.h Log Message: -dsp option removed, displaying help text (-ao oss:dsp_path) Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- mplayer.c 30 Jun 2001 22:17:14 -0000 1.170 +++ mplayer.c 2 Jul 2001 19:25:34 -0000 1.171 @@ -370,7 +370,7 @@ 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 @@ 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 @@ 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"); Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- cfg-mplayer.h 23 Jun 2001 19:58:32 -0000 1.63 +++ cfg-mplayer.h 2 Jul 2001 19:25:34 -0000 1.64 @@ -46,7 +46,8 @@ 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 @@ {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {NULL, NULL, 0, 0, 0, 0} }; - _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog