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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 27 12:07:28 2020 +0300| [96d67cec94eec10173e2a58c6a70ae48baf90984] | committer: Rémi Denis-Courmont

demux: de-inline demux_Demux()

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

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

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 8a9cc57bf9..090e3acd5e 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -298,14 +298,7 @@ static inline void demux_Delete(demux_t *demux)
 VLC_API int demux_vaControlHelper( stream_t *, int64_t i_start, int64_t i_end,
                                    int64_t i_bitrate, int i_align, int i_query, va_list args );
 
-VLC_USED static inline int demux_Demux( demux_t *p_demux )
-{
-    if( !p_demux->pf_demux )
-        return VLC_DEMUXER_SUCCESS;
-
-    return p_demux->pf_demux( p_demux );
-}
-
+VLC_API int demux_Demux( demux_t *p_demux ) VLC_USED;
 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 6707b8cc73..849fde2a3a 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -198,6 +198,13 @@ error:
     return NULL;
 }
 
+int demux_Demux(demux_t *demux)
+{
+    if (demux->pf_demux != NULL)
+        return demux->pf_demux(demux);
+    return VLC_DEMUXER_SUCCESS;
+}
+
 #define static_control_match(foo) \
     static_assert((unsigned) DEMUX_##foo == STREAM_##foo, "Mismatch")
 
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 4c6c588f73..bd00a9b74a 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -92,6 +92,7 @@ vlc_decoder_device_Release
 demux_PacketizerDestroy
 demux_PacketizerNew
 demux_New
+demux_Demux
 demux_vaControl
 demux_vaControlHelper
 vlc_demux_chained_New