Mercurial > mplayer.hg
diff libmpdemux/open.c @ 7329:9129781e5939
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
author | arpi |
---|---|
date | Sun, 08 Sep 2002 23:00:01 +0000 |
parents | f4710b873abd |
children | 1394aebaa838 |
line wrap: on
line diff
--- a/libmpdemux/open.c Sun Sep 08 22:57:23 2002 +0000 +++ b/libmpdemux/open.c Sun Sep 08 23:00:01 2002 +0000 @@ -68,7 +68,6 @@ #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 @@ //============ 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 (!stream_open_tv(stream, tv_handler)) goto tv_err; + + stream->priv=tv_handler; return(stream);