diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-06 22:45:02 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-06 22:45:02 +0200 |
| commit | 5c0576ca5519d525c6c383cd138da917b67a2810 (patch) | |
| tree | 08a6f4b78ec2769265bb210e408a46b36f78be61 /src/output_control.c | |
| parent | 4e909f94113360933b77cf9e67ec54649d48665f (diff) | |
| parent | 039b3544902fe479fa2ce31f06de2c08377e0fc5 (diff) | |
| download | mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.gz mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.xz mpd-5c0576ca5519d525c6c383cd138da917b67a2810.zip | |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/player_control.c
src/player_thread.c
src/playlist_song.c
Diffstat (limited to 'src/output_control.c')
| -rw-r--r-- | src/output_control.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/output_control.c b/src/output_control.c index 69553145a..7b95be49b 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -126,9 +126,6 @@ audio_output_disable(struct audio_output *ao) ao_lock_command(ao, AO_COMMAND_DISABLE); } -static void -audio_output_close_locked(struct audio_output *ao); - /** * Object must be locked (and unlocked) by the caller. */ |