diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-10 23:32:10 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-10 23:32:10 +0000 |
| commit | fc363d39bc8a1aecc72b62c1108d7cc3b0b40a64 (patch) | |
| tree | 7af9a7653c089d0c57bda269d4ffc82a2a97b789 /libmpdemux/demuxer.c | |
| parent | 31dc28382695dd2fa4a86a9676113a4eb36010ec (diff) | |
| download | mpv-fc363d39bc8a1aecc72b62c1108d7cc3b0b40a64.tar.bz2 mpv-fc363d39bc8a1aecc72b62c1108d7cc3b0b40a64.tar.xz | |
tv update
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2803 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 76ee019e52..3b39177f87 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -158,7 +158,9 @@ 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); #ifdef USE_TV -int demux_tv_fill_buffer(demuxer_t *demux); +#include "tv.h" +extern tvi_handle_t *tv_handler; +int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh); #endif int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ @@ -174,7 +176,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); #ifdef USE_TV - case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux); + case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler); #endif } return 0; @@ -554,7 +556,7 @@ switch(file_format){ } #ifdef USE_TV case DEMUXER_TYPE_TV: { - demux_open_tv(demuxer); + demux_open_tv(demuxer, tv_handler); break; } #endif |