Merge release 0.15.14 from branch 'v0.15.x'

Conflicts:
	NEWS
	configure.ac
	src/decoder_control.c
	src/decoder_control.h
	src/input/rewind_input_plugin.c
	src/output_control.c
	src/output_thread.c
	src/player_thread.c

1 files changed, 2 insertions, 1 deletions

diff --git a/src/output_internal.h b/src/output_internal.h
index 9e4d1f25d..18d431352 100644
--- a/src/output_internal.h
+++ b/src/output_internal.h
@@ -196,7 +196,8 @@ struct audio_output {
 	const struct music_pipe *pipe;
 
 	/**
-	 * This mutex protects #open, #chunk and #chunk_finished.
+	 * This mutex protects #open, #fail_timer, #chunk and
+	 * #chunk_finished.
 	 */
 	GMutex *mutex;