From de0cdee4aaf891f69b876134c14dd7df6af4f331 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 6 Jan 2010 09:55:20 +0100 Subject: decoder/flac: pass bits_per_sample to flac_sample_format() Easier to reuse the function. --- src/decoder/_flac_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c index 2081f7b09..9a3449096 100644 --- a/src/decoder/_flac_common.c +++ b/src/decoder/_flac_common.c @@ -59,9 +59,9 @@ flac_data_deinit(struct flac_data *data) } static enum sample_format -flac_sample_format(const FLAC__StreamMetadata_StreamInfo *si) +flac_sample_format(unsigned bits_per_sample) { - switch (si->bits_per_sample) { + switch (bits_per_sample) { case 8: return SAMPLE_FORMAT_S8; @@ -89,7 +89,7 @@ flac_got_stream_info(struct flac_data *data, GError *error = NULL; if (!audio_format_init_checked(&data->audio_format, stream_info->sample_rate, - flac_sample_format(stream_info), + flac_sample_format(stream_info->bits_per_sample), stream_info->channels, &error)) { g_warning("%s", error->message); g_error_free(error); -- cgit v1.2.3