diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-08 23:00:01 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-08 23:00:01 +0000 |
| commit | cd8540ab8cdc8cb314c7ca3ac9107b65577e0fcf (patch) | |
| tree | bea6b35ad9d4c60b6a6516e554a35baa53771bc4 /libmpdemux/demuxer.c | |
| parent | 095a1cad2d136cd5e0e7eec7c8e012e1cfdfe766 (diff) | |
| download | mpv-cd8540ab8cdc8cb314c7ca3ac9107b65577e0fcf.tar.bz2 mpv-cd8540ab8cdc8cb314c7ca3ac9107b65577e0fcf.tar.xz | |
removed messy global 'tv_handle', use stream->priv for that purpose
note: i couldn't test it (only compile test) may be broken :(
we're going to an unified demuxer API - required for modularization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7330 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 22588cb115..4aa929f948 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -157,13 +157,12 @@ extern void demux_close_rawdv(demuxer_t* demuxer); #ifdef USE_TV #include "tv.h" -extern tvi_handle_t *tv_handler; extern int tv_param_on; -extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds, tvi_handle_t *tvh); -extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); +extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds); +extern int demux_open_tv(demuxer_t *demuxer); #if defined(USE_TV) && defined(HAVE_TV_V4L) -extern void demux_close_tv(demuxer_t *demuxer, tvi_handle_t *tvh); +extern void demux_close_tv(demuxer_t *demuxer); #endif #endif @@ -191,7 +190,7 @@ void free_demuxer(demuxer_t *demuxer){ demux_close_nuv(demuxer); break; #if defined(USE_TV) && defined(HAVE_TV_V4L) case DEMUXER_TYPE_TV: - demux_close_tv(demuxer, tv_handler); break; + demux_close_tv(demuxer); break; #endif #ifdef HAVE_LIBDV095 case DEMUXER_TYPE_RAWDV: @@ -312,7 +311,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux); case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux); #ifdef USE_TV - case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds, tv_handler); + case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds); #endif case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux); case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds); @@ -994,11 +993,7 @@ switch(file_format){ } #ifdef USE_TV case DEMUXER_TYPE_TV: { - if (!demux_open_tv(demuxer, tv_handler)) - { - tv_uninit(tv_handler); - return(NULL); - } + if (!demux_open_tv(demuxer)) return(NULL); break; } #endif |