github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-24 19:37:30 +01:00
Code Releases Activity

tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10275 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-06-09 22:01:33 +00:00
parent a5d47c6d52
commit fd8eef242d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libmpdemux/demuxer.c
View File

@ -887,18 +887,6 @@ if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TS){
demuxer=NULL;
}
}
//=============== Try to open as MPEG-TY file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TY)
{
demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_TY,audio_id,video_id,dvdsub_id);
if(ds_fill_buffer(demuxer->video)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"TiVo (DeMuxer By WyngNut)");
file_format=DEMUXER_TYPE_MPEG_TY;
} else {
free_demuxer(demuxer);
demuxer = NULL;
}
}
//=============== Try to open as MPEG-PS file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
int pes=1;
@ -1047,6 +1035,18 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_XMMS){
}
}
#endif
//=============== Try to open as MPEG-TY file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TY)
{
demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_TY,audio_id,video_id,dvdsub_id);
if(ds_fill_buffer(demuxer->video)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"TiVo (DeMuxer By WyngNut)");
file_format=DEMUXER_TYPE_MPEG_TY;
} else {
free_demuxer(demuxer);
demuxer = NULL;
}
}
//=============== Try to open as a RTP stream: ===========
if(file_format==DEMUXER_TYPE_RTP) {
demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id);