diff options
author | wm4 <wm4@nowhere> | 2019-06-19 16:48:46 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-09-19 20:37:05 +0200 |
commit | e40885d963f8b60d83aa5ea8104985dd20af262f (patch) | |
tree | 82c2fd8284e9a81a211dc7755f5e40e97926cd6e /demux/demux_playlist.c | |
parent | de3ecc60cb5ac39e727d8bd1fe4f9e3499f8e672 (diff) | |
download | mpv-e40885d963f8b60d83aa5ea8104985dd20af262f.tar.bz2 mpv-e40885d963f8b60d83aa5ea8104985dd20af262f.tar.xz |
stream: create memory streams in more straightforward way
Instead of having to rely on the protocol matching, make a function that
creates a stream from a stream_info_t directly. Instead of going through
a weird indirection with STREAM_CTRL, add a direct argument for non-text
arguments to the open callback. Instead of creating a weird dummy
mpv_global, just pass an existing one from all callers. (The latter one
is just an artifact from the past, where mpv_global wasn't available
everywhere.)
Actually I just wanted a function that creates a stream without any of
that bullshit. This goal was slightly missed, since you still need this
heavy "constructor" just to setup a shitty struct with some shitty
callbacks.
Diffstat (limited to 'demux/demux_playlist.c')
-rw-r--r-- | demux/demux_playlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index b36e9cdfe1..897b83465f 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -366,7 +366,7 @@ static int open_file(struct demuxer *demuxer, enum demux_check check) p->add_base = true; bstr probe_buf = stream_peek(demuxer->stream, PROBE_SIZE); - p->s = open_memory_stream(probe_buf.start, probe_buf.len); + p->s = stream_memory_open(demuxer->global, probe_buf.start, probe_buf.len); p->s->mime_type = demuxer->stream->mime_type; p->utf16 = stream_skip_bom(p->s); p->force = force; |