Skip to content

Commit

Permalink
demux: deduplicate demux destroy callback
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémi Denis-Courmont committed Mar 30, 2018
1 parent 615b945 commit 38f1f44
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions src/input/demux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 38f1f44

Please sign in to comment.