Merge branch 'v0.19.x'
This commit is contained in:
commit
4741d7bfe2
1
NEWS
1
NEWS
@ -18,6 +18,7 @@ ver 0.20 (not yet released)
|
|||||||
ver 0.19.7 (not yet released)
|
ver 0.19.7 (not yet released)
|
||||||
* playlist
|
* playlist
|
||||||
- don't skip non-existent songs in "listplaylist"
|
- don't skip non-existent songs in "listplaylist"
|
||||||
|
* fix memory allocator bug on Windows
|
||||||
|
|
||||||
ver 0.19.6 (2014/12/08)
|
ver 0.19.6 (2014/12/08)
|
||||||
* decoder
|
* decoder
|
||||||
|
@ -67,7 +67,7 @@ input_stream_global_init(Error &error)
|
|||||||
case InputPlugin::InitResult::UNAVAILABLE:
|
case InputPlugin::InitResult::UNAVAILABLE:
|
||||||
if (error.IsDefined()) {
|
if (error.IsDefined()) {
|
||||||
FormatError(error,
|
FormatError(error,
|
||||||
"Input plugin '%s' is unavailable: ",
|
"Input plugin '%s' is unavailable",
|
||||||
plugin->name);
|
plugin->name);
|
||||||
error.Clear();
|
error.Clear();
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,8 @@ gcc_malloc
|
|||||||
static inline void *
|
static inline void *
|
||||||
HugeAllocate(size_t size)
|
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
|
static inline void
|
||||||
|
Loading…
Reference in New Issue
Block a user