[vlc-commits] demux: inline demux_Delete()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 29 22:46:52 2018 +0300| [33b6c0f9eedd2973344719dcd83de172ae75efde] | committer: Rémi Denis-Courmont

demux: inline demux_Delete()

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

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

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index c0155fe54f..334a22d1e4 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -279,8 +279,10 @@ enum demux_query_e
 VLC_API demux_t *demux_New( vlc_object_t *p_obj, const char *psz_name,
                             const char *psz_path, stream_t *s, es_out_t *out );
 
-VLC_API void demux_Delete( demux_t * );
-
+static inline void demux_Delete(demux_t *demux)
+{
+    vlc_stream_Delete(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 );
diff --git a/src/input/demux.c b/src/input/demux.c
index d351328e8e..c2870767a8 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -272,14 +272,6 @@ error:
     return NULL;
 }
 
-/*****************************************************************************
- * demux_Delete:
- *****************************************************************************/
-void demux_Delete( demux_t *p_demux )
-{
-    vlc_stream_Delete( p_demux );
-}
-
 #define static_control_match(foo) \
     static_assert((unsigned) DEMUX_##foo == STREAM_##foo, "Mismatch")
 
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index b119285cdb..6107aa577b 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -80,7 +80,6 @@ decoder_GetDisplayRate
 decoder_GetInputAttachments
 decoder_NewAudioBuffer
 decoder_NewSubpicture
-demux_Delete
 demux_PacketizerDestroy
 demux_PacketizerNew
 demux_New