Mercurial > mplayer.hg
changeset 10274:cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
| author | arpi |
|---|---|
| date | Mon, 09 Jun 2003 22:01:33 +0000 |
| parents | 02c2c05b7da6 |
| children | 7799d1b4448b |
| files | libmpdemux/demuxer.c |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Mon Jun 09 16:48:02 2003 +0000 +++ b/libmpdemux/demuxer.c Mon Jun 09 22:01:33 2003 +0000 @@ -887,18 +887,6 @@ 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 @@ } } #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);