diff options
author | wm4 <wm4@nowhere> | 2013-07-11 21:10:42 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-12 21:56:40 +0200 |
commit | 52c3eb69765a0d1070bf240353095c8ff546765b (patch) | |
tree | db654a9798f4941dbc3b57c8569fcdeb0b21d24a /video | |
parent | d17d2fdc7c536821b3fea8c4a37c0ad09fc487db (diff) | |
download | mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.bz2 mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.xz |
core: change open_stream and demux_open signature
This removes the dependency on DEMUXER_TYPE_* and the file_format
parameter from the stream open functions.
Remove some of the playlist handling code. It looks like this was
needed only for loading linked mov files with demux_mov (which was
removed long ago).
Delete a minor bit of dead network-related code from stream.c as well.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/gl_lcms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c index 69f7c7fa12..f7e418f1d1 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -85,7 +85,7 @@ static void lcms2_error_handler(cmsContext ctx, cmsUInt32Number code, static struct bstr load_file(void *talloc_ctx, const char *filename) { struct bstr res = {0}; - stream_t *s = open_stream(filename, NULL, NULL); + stream_t *s = stream_open(filename, NULL); if (s) { res = stream_read_complete(s, talloc_ctx, 1000000000); free_stream(s); |