Merge branch 'v0.16.x'

Conflicts:
	src/player_thread.c
This commit is contained in:
Max Kellermann
2011-09-22 00:27:34 +02:00
7 changed files with 81 additions and 18 deletions

View File

@@ -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;