From 1672204dc53ffadb365ca516f9c261fb84da5766 Mon Sep 17 00:00:00 2001 From: Thomas V Date: Thu, 9 Feb 2017 18:08:02 -0600 Subject: dvb: move priv allocation to dvb_open This fixes a crash when changing channels; previously stream->priv would not be initialized when dvb_get_state reused the existing state. Signed-off-by: Thomas VanSelus --- stream/stream_dvb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 4cdbacc681..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; @@ -1009,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; -- cgit v1.2.3