vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Wed Aug 13 10:16:09 2014 +0200| [306343923aba49dcd383daf68275cbd43b943a43] | committer: Jean-Baptiste Kempf
TS: Fix crashing with CSA Close #11955 (cherry picked from commit 5d8962447c6c31136597cc6c8b4efed947d144e2) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=306343923aba49dcd383daf68275cbd43b943a43 --- 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 e3324bc..21111a7 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; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
