Mercurial > mplayer.hg
changeset 2878:1ca86a8dc530
qt/mov detection first
| author | arpi |
|---|---|
| date | Tue, 13 Nov 2001 21:10:51 +0000 |
| parents | c1298484a2d0 |
| children | a3410c946b54 |
| files | libmpdemux/demuxer.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Tue Nov 13 21:00:40 2001 +0000 +++ b/libmpdemux/demuxer.c Tue Nov 13 21:10:51 2001 +0000 @@ -405,6 +405,14 @@ 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 @@ 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);