Commit cd38aa3b authored by Max Kellermann's avatar Max Kellermann

Merge branch 'v0.20.x'

parents daeb7ae9 eee10ad2
......@@ -270,6 +270,7 @@ CurlInputStream::OnData(ConstBuffer<void> data)
void
CurlInputStream::OnEnd()
{
const std::lock_guard<Mutex> protect(mutex);
cond.broadcast();
AsyncInputStream::SetClosed();
......@@ -278,6 +279,7 @@ CurlInputStream::OnEnd()
void
CurlInputStream::OnError(std::exception_ptr e) noexcept
{
const std::lock_guard<Mutex> protect(mutex);
postponed_exception = std::move(e);
if (IsSeekPending())
......
......@@ -122,7 +122,7 @@ sample_format_size(SampleFormat format)
* @param format a #SampleFormat enum value
* @return the string
*/
gcc_pure gcc_malloc gcc_returns_nonnull
gcc_pure gcc_returns_nonnull
const char *
sample_format_to_string(SampleFormat format) noexcept;
......
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