diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-16 21:30:10 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-16 21:30:10 +0000 |
commit | 70eb7d6a585393d21090b0752513c0a96ede979e (patch) | |
tree | 4f02bbd52b5ed537e8c1fc9015c9e4b7cec70f83 /libmpdemux/demuxer.c | |
parent | fa0d4bc0f672db0063cbaaeae22a1ea5bc83b9e1 (diff) | |
download | mpv-70eb7d6a585393d21090b0752513c0a96ede979e.tar.bz2 mpv-70eb7d6a585393d21090b0752513c0a96ede979e.tar.xz |
tv interface update
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2932 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r-- | libmpdemux/demuxer.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 93e5062311..a6ccb1b019 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -160,7 +160,10 @@ int demux_vivo_fill_buffer(demuxer_t *demux); #ifdef USE_TV #include "tv.h" extern tvi_handle_t *tv_handler; -int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh); +extern int tv_param_on; + +extern int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh); +extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); #endif int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ @@ -352,10 +355,8 @@ demuxer_t* demux_open_avi(demuxer_t* demuxer); int mov_check_file(demuxer_t* demuxer); int mov_read_header(demuxer_t* demuxer); -#ifdef USE_TV -/* tv ! */ -extern int tv_param_on; -#endif +extern int vivo_check_file(demuxer_t *demuxer); +extern void demux_open_vivo(demuxer_t *demuxer); demuxer_t* demux_open(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){ |