From b1c202c12fdd2b53f49e7a9ca5c2f4b84733f511 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2018 22:40:12 +0200 Subject: demux: make demux_open() private I always wanted to get rid of this, because it makes the ownership rules for the stream pointer really awkward. demux_edl.c was the only remaining user of this. Replace it with a semi-clever idea: the init segment shit can be used to pass the "file" contents as memory block, and "memory://" itself provides an empty stream. I have no idea if this actually works, because I didn't immediately find a test stream (would have to be some youtube DASH shit). --- demux/demux_edl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'demux/demux_edl.c') diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 7f85568eae..9fbdbc9acf 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -237,10 +237,12 @@ static void build_timeline(struct timeline *tl, struct tl_parts *parts) MP_ERR(tl, "Could not read init fragment.\n"); goto error; } - s = open_memory_stream(tl->init_fragment.start, tl->init_fragment.len); - tl->track_layout = demux_open(s, NULL, tl->global); + struct demuxer_params params = { + .init_fragment = tl->init_fragment, + }; + tl->track_layout = demux_open_url("memory://", ¶ms, tl->cancel, + tl->global); if (!tl->track_layout) { - free_stream(s); MP_ERR(tl, "Could not demux init fragment.\n"); goto error; } -- cgit v1.2.3