[vlc-commits] demux: deduplicate demux destroy callback

[Rémi Denis-Courmont]

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

demux: deduplicate demux destroy callback

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

 src/input/demux.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index 16e747aad9..d351328e8e 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -165,16 +165,6 @@ static void demux_DestroyAccessDemux(demux_t *demux)
     assert(demux->s == NULL);
 }
 
-static void demux_DestroyDemuxFilter(demux_t *demux)
-{
-    module_unneed(demux, demux->p_module);
-    free(demux->psz_filepath);
-    free(demux->psz_name);
-
-    assert(demux->p_next != NULL);
-    demux_Delete(demux->p_next);
-}
-
 static int demux_Probe(void *func, va_list ap)
 {
     int (*probe)(vlc_object_t *) = func;
@@ -509,7 +499,7 @@ int demux_GetSeekpoint( demux_t *p_demux )
 static demux_t *demux_FilterNew( demux_t *p_next, const char *p_name )
 {
     demux_t *p_demux = vlc_stream_CommonNew(VLC_OBJECT(p_next),
-                                            demux_DestroyDemuxFilter);
+                                            demux_DestroyDemux);
     if (unlikely(p_demux == NULL))
         return NULL;