diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-06 21:21:14 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-06 21:21:14 +0000 |
| commit | 77d0b6c3f451ec6ddc5e274e6f2f1c752d7397db (patch) | |
| tree | 15b8ecf9d3c35b6116c4eb46543b4374c58fbcbb /libmpdemux/demuxer.c | |
| parent | c750b8ab2d3c83cb2cdcdd2d97b8ae5aa7a8955f (diff) | |
| download | mpv-77d0b6c3f451ec6ddc5e274e6f2f1c752d7397db.tar.bz2 mpv-77d0b6c3f451ec6ddc5e274e6f2f1c752d7397db.tar.xz | |
detection reordered. note: raw DV detection should be more reliable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6943 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 495ae09e35..e9f7f81b44 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -576,6 +576,15 @@ if((tv_param_on == 1) && } #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 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_RAWDV) 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_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){ 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); |