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
This commit is contained in:
Max Kellermann
2010-11-07 15:30:18 +01:00
11 changed files with 109 additions and 45 deletions

View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "decoder_control.h"
#include "player_control.h"
#include "pipe.h"
#include <assert.h>
@@ -106,6 +107,7 @@ dc_start(struct decoder_control *dc, struct song *song,
assert(song != NULL);
assert(buffer != NULL);
assert(pipe != NULL);
assert(music_pipe_empty(pipe));
dc->song = song;
dc->buffer = buffer;