diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /demux/demux_tv.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'demux/demux_tv.c')
| -rw-r--r-- | demux/demux_tv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/demux/demux_tv.c b/demux/demux_tv.c index d80693e465..4a8e0c70fa 100644 --- a/demux/demux_tv.c +++ b/demux/demux_tv.c @@ -22,7 +22,10 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check) tvi_handle_t *tvh; const tvi_functions_t *funcs; - if (check > DEMUX_CHECK_REQUEST || demuxer->stream->type != STREAMTYPE_TV) + if (check > DEMUX_CHECK_REQUEST) + return -1; + + if (!demuxer->stream->info || strcmp(demuxer->stream->info->name, "tv") != 0) return -1; tv_param_t *params = mp_get_config_group(demuxer, demuxer->global, @@ -31,7 +34,7 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check) bstr channel, input; bstr_split_tok(urlparams, "/", &channel, &input); if (channel.len) { - talloc_free(params->channels); + talloc_free(params->channel); params->channel = bstrto0(NULL, channel); } if (input.len) { |