diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-11 00:02:46 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-11 00:02:46 +0000 |
| commit | d891bc11ccbe529beb532f44c0fc837d5dbb5f3f (patch) | |
| tree | 00d6baa4f49709d223730b991b0c179f27850301 /libmpdemux/open.c | |
| parent | a3b1944cc63a540c05d9368ab05afc80f36da0d9 (diff) | |
| download | mpv-d891bc11ccbe529beb532f44c0fc837d5dbb5f3f.tar.bz2 mpv-d891bc11ccbe529beb532f44c0fc837d5dbb5f3f.tar.xz | |
this patch fixes
1) some bugs introduced in the tuner autodetection and in the channel-parsing functions,
3) retries reading when the mplayer/mencoder don't read fast enough (sooner it exited)
but especially
4) makes the stream compliant with the new, modular stream api (the one
currently in CVS is not and is totally unreachable).
[and maybe more, next time please include cvslog in patch! -- A'rpi]
patch by Nico <nsabbi@libero.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10561 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/open.c')
| -rw-r--r-- | libmpdemux/open.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 927dbeb971..1f9e99731f 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -30,8 +30,6 @@ extern int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url); static URL_t* url; #endif -int dvbin_param_on=0; - /// We keep these 2 for the gui atm, but they will be removed. int dvd_title=0; int vcd_track=0; @@ -71,10 +69,6 @@ char * dvd_audio_stream_channels[6] = #include "cue_read.h" -#ifdef HAS_DVBIN_SUPPORT -#include "dvbin.h" -#endif - // Define function about auth the libsmbclient library @@ -455,18 +449,6 @@ if(strncmp("dvd://",filename,6) == 0){ } #endif -#ifdef HAS_DVBIN_SUPPORT -if(strncmp("dvbin://",filename,8) == 0) -{ - stream = new_stream(-1, STREAMTYPE_DVB); - if (!stream) - return(NULL); - if (!dvb_streaming_start(stream)) - return NULL; - - return stream; -} -#endif #ifdef MPLAYER_NETWORK #ifdef STREAMING_LIVE_DOT_COM |