[vlc-commits] demux: de-inline demux_Control()

Rémi Denis-Courmont git at videolan.org
Tue Oct 20 22:33:13 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 20 21:07:46 2015 +0300| [b9fa70262ba572e3ae0a2e2b75f829c3f55affea] | committer: Rémi Denis-Courmont

demux: de-inline demux_Control()

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

 include/vlc_demux.h |    5 +----
 src/input/demux.c   |    5 +++++
 src/libvlccore.sym  |    1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 252b947..547428d 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -292,10 +292,7 @@ VLC_USED static inline int demux_Demux( demux_t *p_demux )
     return p_demux->pf_demux( p_demux );
 }
 
-static inline int demux_vaControl( demux_t *p_demux, int i_query, va_list args )
-{
-    return p_demux->pf_control( p_demux, i_query, args );
-}
+VLC_API int demux_vaControl( demux_t *p_demux, int i_query, va_list args );
 
 static inline int demux_Control( demux_t *p_demux, int i_query, ... )
 {
diff --git a/src/input/demux.c b/src/input/demux.c
index a8a07de..22c3f91 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -262,6 +262,11 @@ void demux_Delete( demux_t *p_demux )
 #define static_control_match(foo) \
     static_assert((unsigned) DEMUX_##foo == STREAM_##foo, "Mismatch")
 
+int demux_vaControl( demux_t *demux, int query, va_list args )
+{
+    return demux->pf_control( demux, query, args );
+}
+
 /*****************************************************************************
  * demux_vaControlHelper:
  *****************************************************************************/
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 31361c5..185f02e 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -92,6 +92,7 @@ demux_Delete
 demux_PacketizerDestroy
 demux_PacketizerNew
 demux_New
+demux_vaControl
 demux_vaControlHelper
 dialog_ExtensionUpdate
 dialog_Login



More information about the vlc-commits mailing list