# HG changeset patch
# User arpi
# Date 1009558150 0
# Node ID dd5ae1d5ea42fe2802f5f2680ef13b10509f53cc
# Parent  d05cfaf5f0f2ed0d7d0455f81badf5acdd9e2979
asf<->y4m detection swapped

diff -r d05cfaf5f0f2 -r dd5ae1d5ea42 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Fri Dec 28 13:56:04 2001 +0000
+++ b/libmpdemux/demuxer.c	Fri Dec 28 16:49:10 2001 +0000
@@ -415,6 +415,14 @@
     }
   }
 }
+//=============== Try to open as Y4M file: =================
+if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
+  demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
+  if(y4m_check_file(demuxer)){
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n");
+      file_format=DEMUXER_TYPE_Y4M;
+  }
+}
 //=============== Try to open as ASF file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
@@ -423,14 +431,6 @@
       file_format=DEMUXER_TYPE_ASF;
   }
 }
-//=============== Try to open as Y4M file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
-  demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
-  if(y4m_check_file(demuxer)){
-      mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n");
-      file_format=DEMUXER_TYPE_Y4M;
-  }
-}
 //=============== Try to open as NUV file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id);