summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-25 00:43:04 +0200
committerwm4 <wm4@nowhere>2013-06-25 00:43:04 +0200
commit403a266d466850621397c07e0b96cc2c493b2936 (patch)
tree0835a0908b3df8cca8374d173c34e0bf7df7d842 /video
parent536871d7e5848eb385b97202a33b9382b5e8ab0e (diff)
parent54851d60614e912fc422658302d72811a31b80f8 (diff)
downloadmpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2
mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_lcms.c2
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;