[vlc-devel] [PATCH 11/16] mux: ps: use sout_mux_operations table

Alexandre Janniaux ajanni at videolabs.io
Mon Mar 15 17:03:04 UTC 2021


---
 modules/mux/mpeg/ps.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 4e969eb422..be8ee2a693 100644
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -153,10 +153,14 @@ static int Open( vlc_object_t *p_this )
     msg_Info( p_mux, "Open" );
     config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
 
-    p_mux->pf_control   = Control;
-    p_mux->pf_addstream = AddStream;
-    p_mux->pf_delstream = DelStream;
-    p_mux->pf_mux       = Mux;
+    static const struct sout_mux_operations mux_ops =
+    {
+        .control = Control,
+        .add_stream = AddStream,
+        .del_stream = DelStream,
+        .mux = Mux,
+    };
+    p_mux->ops = &mux_ops;
     p_mux->p_sys        = p_sys = malloc( sizeof( sout_mux_sys_t ) );
 
     /* Init free stream id */
-- 
2.30.2



More information about the vlc-devel mailing list