[vlc-commits] sout: remove sout_stream_t.pf_control

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 10 19:06:18 2020 +0300| [f60dbd05c032bef2c855d3ccfb318d2736906759] | committer: Rémi Denis-Courmont

sout: remove sout_stream_t.pf_control

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

 include/vlc_sout.h                | 8 ++------
 src/stream_output/stream_output.c | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 16130eedba..2ca2adfa2d 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -197,7 +197,6 @@ struct sout_stream_t
     void              (*pf_del)( sout_stream_t *, void * );
     /* manage a packet */
     int               (*pf_send)( sout_stream_t *, void *, block_t* );
-    int               (*pf_control)( sout_stream_t *, int, va_list );
 
     void              *p_sys;
 };
@@ -243,11 +242,8 @@ static inline void sout_StreamFlush( sout_stream_t *s,
 
 static inline int sout_StreamControlVa( sout_stream_t *s, int i_query, va_list args )
 {
-    if (s->ops == NULL) {
-        if (s->pf_control == NULL)
-            return VLC_EGENERIC;
-        return s->pf_control(s, i_query, args);
-    }
+    if (s->ops == NULL)
+        return VLC_EGENERIC;
     if (s->ops->control == NULL)
         return VLC_EGENERIC;
     return s->ops->control(s, i_query, args);
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index af26d5aad3..c86ad8d7a3 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -802,7 +802,6 @@ static sout_stream_t *sout_StreamNew( vlc_object_t *parent, char *psz_name,
     p_stream->p_cfg    = p_cfg;
     p_stream->p_next   = p_next;
     p_stream->ops = NULL;
-    p_stream->pf_control = NULL;
     p_stream->p_sys = NULL;
 
     msg_Dbg( p_stream, "stream=`%s'", p_stream->psz_name );