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 /stream/stream_dvb.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 'stream/stream_dvb.c')
-rw-r--r-- | stream/stream_dvb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 6e55d8c156..01ec6c2e77 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -931,6 +931,7 @@ static int dvb_open(stream_t *stream) return STREAM_ERROR; } + stream->priv = mp_get_config_group(stream, stream->global, &stream_dvb_conf); dvb_state_t* state = dvb_get_state(stream); dvb_priv_t *p = stream->priv; @@ -990,7 +991,6 @@ static int dvb_open(stream_t *stream) return STREAM_ERROR; } - stream->type = STREAMTYPE_DVB; stream->fill_buffer = dvb_streaming_read; stream->close = dvbin_close; stream->control = dvbin_stream_control; @@ -1010,7 +1010,6 @@ dvb_state_t *dvb_get_state(stream_t *stream) } struct mp_log *log = stream->log; struct mpv_global *global = stream->global; - stream->priv = mp_get_config_group(stream, stream->global, &stream_dvb_conf); dvb_priv_t *priv = stream->priv; int type, size; char filename[30], *name; |