diff options
author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
tree | 199bddd30923db1175a1331191eb86ba684e9e41 /video/out | |
parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'video/out')
-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); |