Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 4696:629429644de7
10l... it detected mpeg1/2 ps files as mpeg audio...
| author | arpi |
|---|---|
| date | Thu, 14 Feb 2002 16:09:36 +0000 |
| parents | a21735031d6a |
| children | 21eca91fece7 |
line wrap: on
line diff
--- 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);