# HG changeset patch
# User arpi
# Date 1013702976 0
# Node ID 629429644de7d3cb4b6a33057c4da92dad436769
# Parent  943e3990ccb3d84d2eda8890868e2fbf33397546
10l... it detected mpeg1/2 ps files as mpeg audio...

diff -r 943e3990ccb3 -r 629429644de7 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Thu Feb 14 13:58:30 2002 +0000
+++ b/libmpdemux/demuxer.c	Thu Feb 14 16:09:36 2002 +0000
@@ -543,15 +543,6 @@
   } else
       free_demuxer(demuxer);
 }
-//=============== 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);
-  if(demux_audio_open(demuxer)){
-    mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected audio file\n");
-    file_format=DEMUXER_TYPE_AUDIO;
-  } else
-    free_demuxer(demuxer);
-}
 //=============== Try to open as MPEG-PS file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
  int pes=1;
@@ -625,6 +616,15 @@
     }
   }
 }
+//=============== 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);
+  if(demux_audio_open(demuxer)){
+    mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected audio file\n");
+    file_format=DEMUXER_TYPE_AUDIO;
+  } else
+    free_demuxer(demuxer);
+}
 //=============== Unknown, exiting... ===========================
 if(file_format==DEMUXER_TYPE_UNKNOWN){
   mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);