Mercurial > mplayer.hg
changeset 6942:6048ac6ab001
detection reordered. note: raw DV detection should be more reliable.
| author | arpi |
|---|---|
| date | Tue, 06 Aug 2002 21:21:14 +0000 |
| parents | a16a68266408 |
| children | 9d0090eae586 |
| files | libmpdemux/demuxer.c |
| diffstat | 1 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Tue Aug 06 20:31:48 2002 +0000 +++ b/libmpdemux/demuxer.c Tue Aug 06 21:21:14 2002 +0000 @@ -576,6 +576,15 @@ } #endif +//=============== Try to open as multi file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MF) + if ( mf_support ){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_MF,audio_id,video_id,dvdsub_id); + file_format=DEMUXER_TYPE_MF; + mp_msg( MSGT_DEMUXER,MSGL_INFO,"[demuxer] mf support.\n" ); + } +} + //=============== Try to open as AVI file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id); @@ -808,17 +817,6 @@ free_demuxer(demuxer); } #endif -//=============== Try to open as multi file: ================= -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MF){ - demuxer=new_demuxer(stream,DEMUXER_TYPE_MF,audio_id,video_id,dvdsub_id); - { - if ( mf_support ) - { - file_format=DEMUXER_TYPE_MF; - mp_msg( MSGT_DEMUXER,MSGL_INFO,"[demuxer] mf support.\n" ); - } - } -} //=============== Try to open as audio file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){ demuxer=new_demuxer(stream,DEMUXER_TYPE_AUDIO,audio_id,video_id,dvdsub_id); @@ -834,7 +832,6 @@ if(file_format==DEMUXER_TYPE_RTP) { demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id); } - //=============== Unknown, exiting... =========================== if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);