git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
13bd23a
)
TS: Fix crashing with CSA
author
Jean-Baptiste Kempf
<jb@videolan.org>
Wed, 13 Aug 2014 08:16:09 +0000
(10:16 +0200)
committer
Jean-Baptiste Kempf
<jb@videolan.org>
Wed, 13 Aug 2014 08:16:09 +0000
(10:16 +0200)
Close #11955
modules/mux/mpeg/ts.c
patch
|
blob
|
history
diff --git
a/modules/mux/mpeg/ts.c
b/modules/mux/mpeg/ts.c
index
71bc864
..
4f13f05
100644
(file)
--- 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;
}