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 /core/input/input.c | |
| parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
| parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
| download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz | |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'core/input/input.c')
| -rw-r--r-- | core/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/input/input.c b/core/input/input.c index 2d7569c8e9..dfa7d1e5b4 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -1737,7 +1737,7 @@ static int parse_config_file(struct input_ctx *ictx, char *file, bool warn) mp_msg(MSGT_INPUT, MSGL_ERR, "Can't open input config file %s.\n", file); return 0; } - bstr res = stream_read_complete(s, NULL, 1000000, 0); + bstr res = stream_read_complete(s, NULL, 1000000); free_stream(s); mp_msg(MSGT_INPUT, MSGL_V, "Parsing input config file %s\n", file); int n_binds = parse_config(ictx, false, res, file); |