From 21c9ee71e2e52078f2b23de13ba7c7b413e118ab Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 8 Sep 2018 15:25:53 +0200 Subject: demux: remove some dead code No idea what that shit is. Likely forgotten when timed metadata was introduced, and some of the old mechanisms were replaced. --- demux/demux.c | 8 -------- demux/demux.h | 2 -- 2 files changed, 10 deletions(-) diff --git a/demux/demux.c b/demux/demux.c index e9565166ab..7d3a37663d 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -2189,14 +2189,6 @@ static void update_final_metadata(demuxer_t *demuxer) assert(demuxer == demuxer->in->d_user); struct demux_internal *in = demuxer->in; - int num_streams = MPMIN(in->num_streams, demuxer->num_update_stream_tags); - for (int n = 0; n < num_streams; n++) { - struct sh_stream *sh = in->streams[n]; - // (replace them even if unnecessary, simpler and doesn't hurt) - if (sh->ds->tags_reader) - mp_tags_replace(sh->tags, sh->ds->tags_reader->sh); - } - struct mp_packet_tags *tags = in->master_stream ? in->master_stream->tags_reader : NULL; diff --git a/demux/demux.h b/demux/demux.h index 4fcf8cfbae..1cc740589a 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -232,8 +232,6 @@ typedef struct demuxer { // internal to demux.c struct demux_internal *in; - struct mp_tags **update_stream_tags; - int num_update_stream_tags; // Triggered when ending demuxing forcefully. Usually bound to the stream too. struct mp_cancel *cancel; -- cgit v1.2.3