From 5d8962447c6c31136597cc6c8b4efed947d144e2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf <jb@videolan.org> Date: Wed, 13 Aug 2014 10:16:09 +0200 Subject: [PATCH] TS: Fix crashing with CSA Close #11955 --- modules/mux/mpeg/ts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 71bc8647e2..4f13f056b5 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -723,13 +723,14 @@ static int Open( vlc_object_t *p_this ) p_sys->b_use_key_frames = var_GetBool( p_mux, SOUT_CFG_PREFIX "use-key-frames" ); + p_mux->p_sys = p_sys; + p_sys->csa = csaSetup(p_this); p_mux->pf_control = Control; p_mux->pf_addstream = AddStream; p_mux->pf_delstream = DelStream; p_mux->pf_mux = Mux; - p_mux->p_sys = p_sys; return VLC_SUCCESS; } -- 2.25.4