Merge branch 'v0.16.x'

Conflicts:
	src/player_thread.c
	src/playlist_control.c
This commit is contained in:
Max Kellermann
2011-07-20 21:46:05 +02:00
13 changed files with 101 additions and 38 deletions

View File

@@ -628,7 +628,9 @@ play_chunk(struct player_control *pc,
return true;
}
player_lock(pc);
pc->bit_rate = chunk->bit_rate;
player_unlock(pc);
/* send the chunk to the audio outputs */