diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-04 16:57:09 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-04 16:57:09 +0000 |
| commit | 27b389565961c428cc374adc55e9899439768823 (patch) | |
| tree | 2e8bf962397703f29ec9d7de8cbea8884a62e4b4 /libmpdemux/demuxer.c | |
| parent | 11148f08356f41572684d19355593d5dee4b4b88 (diff) | |
| download | mpv-27b389565961c428cc374adc55e9899439768823.tar.bz2 mpv-27b389565961c428cc374adc55e9899439768823.tar.xz | |
vivo demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2688 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index caefd4d9a8..be9c5e4938 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -156,6 +156,7 @@ int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds); int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds); int demux_asf_fill_buffer(demuxer_t *demux); int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds); +int demux_vivo_fill_buffer(demuxer_t *demux); int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ // Note: parameter 'ds' can be NULL! @@ -168,6 +169,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds); case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux); case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); + case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); } return 0; } @@ -425,8 +427,15 @@ if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above! mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile); } } +//=============== Try to open as VIVO file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); + if(vivo_check_file(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n"); + file_format=DEMUXER_TYPE_VIVO; + } +} //=============== Try to open as MOV file: ================= -#if 1 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); if(mov_check_file(demuxer)){ @@ -434,7 +443,6 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ file_format=DEMUXER_TYPE_MOV; } } -#endif //=============== Unknown, exiting... =========================== if(file_format==DEMUXER_TYPE_UNKNOWN){ mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); @@ -459,6 +467,10 @@ switch(file_format){ return (demuxer_t*) demux_open_avi(demuxer); // break; } + case DEMUXER_TYPE_VIVO: { + demux_open_vivo(demuxer); + break; + } case DEMUXER_TYPE_ASF: { //---- ASF header: read_asf_header(demuxer); |