[vlc-devel] [PATCH 16/16] vlc_sout: remove previous sout_mux_t's pf_* functions

[Alexandre Janniaux]

---
 include/vlc_sout.h | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 646d3886a3..697dc7ae2c 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -115,11 +115,6 @@ struct  sout_mux_t
 
     sout_access_out_t   *p_access;
 
-    int                 (*pf_addstream)( sout_mux_t *, sout_input_t * );
-    void                (*pf_delstream)( sout_mux_t *, sout_input_t * );
-    int                 (*pf_mux)      ( sout_mux_t * );
-    int                 (*pf_control)  ( sout_mux_t *, int, va_list );
-
     /* here are all inputs accepted by muxer */
     int                 i_nb_inputs;
     sout_input_t        **pp_inputs;
@@ -169,10 +164,7 @@ static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... )
     int     i_result;
 
     va_start( args, i_query );
-    if (p_mux->ops == NULL)
-        i_result = p_mux->pf_control( p_mux, i_query, args );
-    else
-        i_result = p_mux->ops->control( p_mux, i_query, args );
+    i_result = p_mux->ops->control( p_mux, i_query, args );
     va_end( args );
     return i_result;
 }
-- 
2.30.2