diff options
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 116520370a..ad6dd0db2b 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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); |