[vlc-commits] mux: remove sout_mux_t.p_sout

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 29 18:20:27 2020 +0200| [cb853c22f08991cbcf5d484320611f1f6959993f] | committer: Rémi Denis-Courmont

mux: remove sout_mux_t.p_sout

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cb853c22f08991cbcf5d484320611f1f6959993f
---

 include/vlc_sout.h                | 2 --
 src/stream_output/stream_output.c | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index fccaf1f23a..687ce5d8ea 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -118,8 +118,6 @@ struct  sout_mux_t
     struct vlc_object_t obj;
     module_t            *p_module;
 
-    sout_instance_t     *p_sout;
-
     char                *psz_mux;
     config_chain_t          *p_cfg;
 
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index b9deb2689b..a62a3a7054 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -398,7 +398,6 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, const char *psz_mux,
     if( p_mux == NULL )
         return NULL;
 
-    p_mux->p_sout = p_sout;
     psz_next = config_ChainCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux );
     free( psz_next );
 
@@ -576,7 +575,7 @@ int sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
 
     if( p_mux->b_waiting_stream && i_dts != VLC_TICK_INVALID )
     {
-        const vlc_tick_t i_caching = VLC_TICK_FROM_MS(var_GetInteger( p_mux->p_sout, "sout-mux-caching" ));
+        const vlc_tick_t i_caching = VLC_TICK_FROM_MS(var_InheritInteger( p_mux, "sout-mux-caching" ));
 
         if( p_mux->i_add_stream_start == VLC_TICK_INVALID )
             p_mux->i_add_stream_start = i_dts;