diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-02 19:25:34 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-02 19:25:34 +0000 |
commit | 76c3dc2348b13cee192cb71df784aff65600fe0a (patch) | |
tree | 6a59846f73053d9f4d6975688c1b4f20e607598f /mplayer.c | |
parent | da580b3956186b7b9952a482ef00551e1d7f967f (diff) | |
download | mpv-76c3dc2348b13cee192cb71df784aff65600fe0a.tar.bz2 mpv-76c3dc2348b13cee192cb71df784aff65600fe0a.tar.xz |
-dsp option removed, displaying help text (-ao oss:dsp_path)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1256 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -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"); |