Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv29484 Modified Files: demuxer.c Log Message: 10l... it detected mpeg1/2 ps files as mpeg audio... Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- demuxer.c 14 Feb 2002 13:04:35 -0000 1.75 +++ demuxer.c 14 Feb 2002 16:09:36 -0000 1.76 @@ -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; @@ -624,6 +615,15 @@ 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); + 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){