mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

10l... it detected mpeg1/2 ps files as mpeg audio...

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4697 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-02-14 16:09:36 +00:00
parent 39ec237078
commit 8b3ed50c4b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmpdemux/demuxer.c
View File

@ -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);