Merge branch 'v0.16.x'

This commit is contained in:
Max Kellermann
2011-09-16 07:52:39 +02:00
5 changed files with 11 additions and 7 deletions

View File

@@ -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

View File

@@ -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);