Merge branch 'v0.17.x'

Conflicts: src/player_thread.c
2012-08-15 22:56:11 +02:00
parent b5fde6dfa5 9374e0f445
commit 8422402c39
6 changed files with 12 additions and 7 deletions
--- a/src/filter/volume_filter_plugin.c
+++ b/src/filter/volume_filter_plugin.c
@@ -26,7 +26,6 @@
 #include "pcm_buffer.h"
 #include "pcm_volume.h"
 #include "audio_format.h"
-#include "player_control.h"

 #include <assert.h>
 #include <string.h>