Mercurial > mplayer.hg
diff libmpdemux/open.c @ 7408:0c6948b8100f
stream layer cleanup part 2
STREAMTYPE_TV removed, use STREAMTYPE_DUMMY instead. tv init moved to demux_open
author | arpi |
---|---|
date | Sun, 15 Sep 2002 20:51:55 +0000 |
parents | 8780415baa87 |
children | 8705ce9a9fe9 |
line wrap: on
line diff
--- a/libmpdemux/open.c Sun Sep 15 19:47:49 2002 +0000 +++ b/libmpdemux/open.c Sun Sep 15 20:51:55 2002 +0000 @@ -390,47 +390,16 @@ } #endif +//============ Check for TV-input or multi-file input ==== + if( (mf_support == 1) #ifdef USE_TV -//============ Check for TV-input ==== - if (tv_param_on == 1) - { - tvi_handle_t *tv_handler; - - /* create stream */ - stream = new_stream(-1, STREAMTYPE_TV); - if (!stream) - return(NULL); - - /* create tvi handler */ - tv_handler = tv_begin(); - if (!tv_handler) - return(NULL); - - /* preinit */ - if (!tv_init(tv_handler)) - goto tv_err; - - if (!stream_open_tv(stream, tv_handler)) - goto tv_err; - - stream->priv=tv_handler; - - return(stream); - - /* something went wrong - uninit */ -tv_err: - tv_uninit(tv_handler); - return(NULL); - } + || (tv_param_on == 1) #endif - -//============ Check for multi file-input ==== - if (mf_support == 1) - { + ){ /* create stream */ stream = new_stream(-1, STREAMTYPE_DUMMY); if (!stream) return(NULL); - stream->url=strdup(filename); + stream->url=filename?strdup(filename):NULL; return(stream); }