Commit 4741d7bf authored by Max Kellermann's avatar Max Kellermann

Merge branch 'v0.19.x'

parents aea99a12 2fec4635
......@@ -18,6 +18,7 @@ ver 0.20 (not yet released)
ver 0.19.7 (not yet released)
* playlist
- don't skip non-existent songs in "listplaylist"
* fix memory allocator bug on Windows
ver 0.19.6 (2014/12/08)
* decoder
......
......@@ -67,7 +67,7 @@ input_stream_global_init(Error &error)
case InputPlugin::InitResult::UNAVAILABLE:
if (error.IsDefined()) {
FormatError(error,
"Input plugin '%s' is unavailable: ",
"Input plugin '%s' is unavailable",
plugin->name);
error.Clear();
}
......
......@@ -70,7 +70,8 @@ gcc_malloc
static inline void *
HugeAllocate(size_t size)
{
return VirtualAlloc(nullptr, size, MEM_LARGE_PAGES, PAGE_READWRITE);
// TODO: use MEM_LARGE_PAGES
return VirtualAlloc(nullptr, size, MEM_RESERVE, PAGE_READWRITE);
}
static inline void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment