diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-16 20:13:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-16 20:13:28 +0000 |
| commit | 5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6 (patch) | |
| tree | d8d453ffd3502d82418494650e44a6dae9ff5359 /libmpdemux/open.c | |
| parent | 79102684ed09aef64829bb0ef67469dfccf5afe3 (diff) | |
| download | mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.bz2 mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.xz | |
this is a combo patch that:
1) adds an experimental TS demuxer to mplayer
2) adds an input (streaming) interface from DVB cards.
It compiles and runs with the following versions of the drivers:
dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18)
patch by Nico <nsabbi@libero.it>
some cleanups, ts demuxer fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/open.c')
| -rw-r--r-- | libmpdemux/open.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index add424d8cf..111e256b67 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -30,6 +30,8 @@ int isSDPFile = 0; static URL_t* url; #endif +int dvbin_param_on=0; + int dvd_title=0; int dvd_chapter=1; int dvd_last_chapter=0; @@ -76,6 +78,12 @@ extern int vcd_get_track_end(int fd,int track); extern int stream_open_tv(stream_t *stream, tvi_handle_t *tvh); #endif +#ifdef HAS_DVBIN_SUPPORT +#include "dvbin.h" +#endif + + + #ifdef HAVE_CDDA stream_t* open_cdda(char* dev,char* track); #ifdef STREAMING @@ -478,6 +486,22 @@ if(dvd_title){ } #endif +#ifdef HAS_DVBIN_SUPPORT +if(dvbin_param_on == 1) +{ + stream = new_stream(-1, STREAMTYPE_DVB); + if (!stream) + return(NULL); + if (!dvb_streaming_start(stream)) + return NULL; + + return stream; +} +#endif + + + + //============ Check for TV-input or multi-file input ==== if( (mf_support == 1) #ifdef USE_TV |