diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-22 00:27:34 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-22 00:27:34 +0200 |
| commit | 7e219c362cf8bca80f60a79b77d95a228ff8ffcb (patch) | |
| tree | d2c44d848c59f074bd1f78dc94732404326d711e /src/decoder_thread.c | |
| parent | 203f48d1fd490fa136df36b96d75d279e3c17047 (diff) | |
| parent | 525a791987c66ed2f8b1ca9e5357836f536fdb8b (diff) | |
Merge branch 'v0.16.x'
Conflicts:
src/player_thread.c
Diffstat (limited to 'src/decoder_thread.c')
| -rw-r--r-- | src/decoder_thread.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/decoder_thread.c b/src/decoder_thread.c index dff4ca08..dbead655 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -380,6 +380,8 @@ decoder_run_song(struct decoder_control *dc, { struct decoder decoder = { .dc = dc, + .initial_seek_pending = song->start_ms > 0, + .initial_seek_running = false, }; int ret; |