summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvb.c3
-rw-r--r--stream/stream_mf.c2
-rw-r--r--stream/tv.c5
3 files changed, 7 insertions, 3 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 8fabfb4fc1..3847e26c75 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -739,7 +739,8 @@ static int dvb_open(stream_t *stream, int mode, void *opts)
stream->close = dvbin_close;
m_struct_free(&stream_opts, opts);
- stream->demuxer = "lavf:mpegts";
+ stream->demuxer = "lavf";
+ stream->lavf_type = "mpegts";
return STREAM_OK;
}
diff --git a/stream/stream_mf.c b/stream/stream_mf.c
index eef5d6fc4d..9354005ae4 100644
--- a/stream/stream_mf.c
+++ b/stream/stream_mf.c
@@ -32,7 +32,7 @@ static int
mf_stream_open (stream_t *stream, int mode, void *opts)
{
stream->type = STREAMTYPE_MF;
- stream->demuxer = "lavf";
+ stream->demuxer = "mf";
return STREAM_OK;
}
diff --git a/stream/tv.c b/stream/tv.c
index aa5383402f..9ddf3771ed 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -701,13 +701,16 @@ static int tv_uninit(tvi_handle_t *tvh)
return res;
}
-static int demux_open_tv(demuxer_t *demuxer)
+static int demux_open_tv(demuxer_t *demuxer, enum demux_check check)
{
tvi_handle_t *tvh;
sh_video_t *sh_video;
sh_audio_t *sh_audio = NULL;
const tvi_functions_t *funcs;
+ if (check > DEMUX_CHECK_REQUEST || demuxer->stream->type != STREAMTYPE_TV)
+ return -1;
+
demuxer->priv=NULL;
if(!(tvh=tv_begin(demuxer->stream->priv))) return -1;
if (!tvh->functions->init(tvh->priv)) return -1;