diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-16 07:52:39 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-16 07:52:39 +0200 |
| commit | 87b624f5d5233af1727b683c6ace1e957d837ed4 (patch) | |
| tree | 98b18a6e20721b9b9063779d7bc0b38457dffe43 /src | |
| parent | e1efc71ad3389ef8b2bdcf8dba5dc124c9a5bf7f (diff) | |
| parent | 443e96381a0e24d9c22578ba6f7fb96de1814994 (diff) | |
| download | mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.gz mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.xz mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.zip | |
Merge branch 'v0.16.x'
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/curl_input_plugin.c | 2 | ||||
| -rw-r--r-- | src/output/pulse_output_plugin.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index d4c116136..dfe2e53c5 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -780,7 +780,7 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data) assert(buffer->consumed <= buffer->size); - g_free(data); + g_free(buffer); } static void diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c index 9825785ee..ecd6a487a 100644 --- a/src/output/pulse_output_plugin.c +++ b/src/output/pulse_output_plugin.c @@ -72,7 +72,8 @@ pulse_output_set_mixer(struct pulse_output *po, struct pulse_mixer *pm) } void -pulse_output_clear_mixer(struct pulse_output *po, struct pulse_mixer *pm) +pulse_output_clear_mixer(struct pulse_output *po, + G_GNUC_UNUSED struct pulse_mixer *pm) { assert(po != NULL); assert(pm != NULL); |