diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-14 16:09:36 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-14 16:09:36 +0000 |
| commit | 8b3ed50c4b5b5408b97364a04521bb4fda0e8744 (patch) | |
| tree | d95ec7df4dd1bab22860711c0dfafa1e4032469d /libmpdemux/demuxer.c | |
| parent | 39ec2370788a95908cbb8577b05dfe78348e5483 (diff) | |
| download | mpv-8b3ed50c4b5b5408b97364a04521bb4fda0e8744.tar.bz2 mpv-8b3ed50c4b5b5408b97364a04521bb4fda0e8744.tar.xz | |
10l... it detected mpeg1/2 ps files as mpeg audio...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4697 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index dc482511e3..a00edfc928 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -543,15 +543,6 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){ } 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 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MF){ } } } +//=============== 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); |