diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-13 21:10:51 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-13 21:10:51 +0000 |
| commit | 923580762e6d2a3e05abf5e0d5ef660cbb1496ff (patch) | |
| tree | f2bedfc0535fe0eabdffdcefc46944a40253b9f4 /libmpdemux | |
| parent | 70943bcb6546f2345ad80b31db055ea0b03b3d9a (diff) | |
| download | mpv-923580762e6d2a3e05abf5e0d5ef660cbb1496ff.tar.bz2 mpv-923580762e6d2a3e05abf5e0d5ef660cbb1496ff.tar.xz | |
qt/mov detection first
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2879 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index ac4fa7d8b7..fb97721f32 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -405,6 +405,14 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){ file_format=DEMUXER_TYPE_ASF; } } +//=============== Try to open as MOV file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); + if(mov_check_file(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile); + file_format=DEMUXER_TYPE_MOV; + } +} //=============== Try to open as MPEG-PS file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){ int pes=1; @@ -450,14 +458,6 @@ if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above! mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile); } } -//=============== Try to open as MOV file: ================= -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ - demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); - if(mov_check_file(demuxer)){ - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile); - file_format=DEMUXER_TYPE_MOV; - } -} //=============== Try to open as VIVO file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); |