# HG changeset patch
# User arpi
# Date 1028668874 0
# Node ID 6048ac6ab00199bd4c6a982a9b2067e1a316b806
# Parent  a16a682664083a57b6a45948f86fbb78074cb38d
detection reordered. note: raw DV detection should be more reliable.

diff -r a16a68266408 -r 6048ac6ab001 libmpdemux/demuxer.c
--- 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);