diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-09 22:01:33 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-09 22:01:33 +0000 |
| commit | fd8eef242d9aabcba381de4f6b996a30c6cf6550 (patch) | |
| tree | 8c5cc947358b8381a4e3c8eef37d1f7554bca4dd /libmpdemux/demuxer.c | |
| parent | a5d47c6d5287e6c7227192cd0dbecc802425ec94 (diff) | |
| download | mpv-fd8eef242d9aabcba381de4f6b996a30c6cf6550.tar.bz2 mpv-fd8eef242d9aabcba381de4f6b996a30c6cf6550.tar.xz | |
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10275 b3059339-0415-0410-9bf9-f77b7e298cf2
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); |