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/open.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/open.c')
| -rw-r--r-- | libmpdemux/open.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 5b3bf25d14..de9a35ce71 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -68,7 +68,6 @@ extern int vcd_get_track_end(int fd,int track); #ifdef USE_TV #include "tv.h" -tvi_handle_t *tv_handler; extern int stream_open_tv(stream_t *stream, tvi_handle_t *tvh); #endif @@ -401,6 +400,8 @@ if(dvd_title){ //============ Check for TV-input ==== if (tv_param_on == 1) { + tvi_handle_t *tv_handler; + /* create stream */ stream = new_stream(-1, STREAMTYPE_TV); if (!stream) @@ -417,6 +418,8 @@ if(dvd_title){ if (!stream_open_tv(stream, tv_handler)) goto tv_err; + + stream->priv=tv_handler; return(stream); |