diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-15 22:56:11 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-15 22:56:11 +0200 |
| commit | 8422402c39d523c8ce9336e9ecf52950f1905bce (patch) | |
| tree | 4c5d3778768890e192685bd9b02f251b9cf85cbf /src/filter | |
| parent | b5fde6dfa55676560ee8805e8e00bc188a5ad928 (diff) | |
| parent | 9374e0f4454ff5a37f70ce2d6110d5612856a169 (diff) | |
Merge branch 'v0.17.x'
Conflicts:
src/player_thread.c
Diffstat (limited to 'src/filter')
| -rw-r--r-- | src/filter/volume_filter_plugin.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/filter/volume_filter_plugin.c b/src/filter/volume_filter_plugin.c index e52c0a46..3260e898 100644 --- 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> |