diff options
| author | Max Kellermann <max@duempel.org> | 2010-11-07 15:30:18 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-11-07 15:30:18 +0100 |
| commit | 4478b3ef741eecf7ed0cf94179986c6f86a57287 (patch) | |
| tree | b10d931fa854e12d813ec796e16a45ae7af930e3 /src/decoder_control.c | |
| parent | 5a263206803556a600a75dd5e1813feb510af268 (diff) | |
| parent | dec7090198a0bbdd91ab8c531b84624f8bde4da9 (diff) | |
| download | mpd-4478b3ef741eecf7ed0cf94179986c6f86a57287.tar.gz mpd-4478b3ef741eecf7ed0cf94179986c6f86a57287.tar.xz mpd-4478b3ef741eecf7ed0cf94179986c6f86a57287.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/decoder_control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/decoder_control.c b/src/decoder_control.c index 224abbf31..a5e6e4ad3 100644 --- a/src/decoder_control.c +++ b/src/decoder_control.c @@ -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; |