aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_api.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-02-13 19:15:18 +0100
committerMax Kellermann <max@duempel.org>2012-02-13 19:15:18 +0100
commitc616165f81a07feb42b96b6078885b2a10c8908f (patch)
treed21c8c77c007e6de0bf50c6daf8f5998d8d978fd /src/decoder_api.c
parentedac498d03b9de59d4e55081c92604ff2447a298 (diff)
parent103832742d4ef2b6bb86d287b8557ab3e64dba21 (diff)
downloadmpd-c616165f81a07feb42b96b6078885b2a10c8908f.tar.gz
mpd-c616165f81a07feb42b96b6078885b2a10c8908f.tar.xz
mpd-c616165f81a07feb42b96b6078885b2a10c8908f.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac src/decoder/ffmpeg_decoder_plugin.c test/read_tags.c
Diffstat (limited to 'src/decoder_api.c')
-rw-r--r--src/decoder_api.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 3d7f20c50..8f12d017a 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -90,6 +90,12 @@ decoder_prepare_initial_seek(struct decoder *decoder)
const struct decoder_control *dc = decoder->dc;
assert(dc->pipe != NULL);
+ if (dc->state != DECODE_STATE_DECODE)
+ /* wait until the decoder has finished initialisation
+ (reading file headers etc.) before emitting the
+ virtual "SEEK" command */
+ return false;
+
if (decoder->initial_seek_running)
/* initial seek has already begun - override any other
command */