diff options
author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /video/out | |
parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz |
Merge branch 'sub_mess2'
...the return.
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 6cded6cd09..69f7c7fa12 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -87,7 +87,7 @@ static struct bstr load_file(void *talloc_ctx, const char *filename) struct bstr res = {0}; stream_t *s = open_stream(filename, NULL, NULL); if (s) { - res = stream_read_complete(s, talloc_ctx, 1000000000, 0); + res = stream_read_complete(s, talloc_ctx, 1000000000); free_stream(s); } return res; |