diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-19 18:18:32 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-19 18:18:32 +0200 |
| commit | c9d43b4d713d508b6f5b67cfffba9296f9436934 (patch) | |
| tree | 70100c28e365a244f5c6a361d2ecda332df2a756 /src/decoder/_flac_common.c | |
| parent | c5ec035fb4a533ebd9f8c69b085604560d2a5487 (diff) | |
| parent | 49ede85827c095d0a6ead0ecb63e83e000a76d4f (diff) | |
| download | mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.tar.gz mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.tar.xz mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.zip | |
Merge branch 'master' of git://git.infradead.org/users/dwmw2/mpd
Conflicts:
Makefile.am
Diffstat (limited to 'src/decoder/_flac_common.c')
| -rw-r--r-- | src/decoder/_flac_common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c index 713dfe9b2..7b3453854 100644 --- a/src/decoder/_flac_common.c +++ b/src/decoder/_flac_common.c @@ -195,9 +195,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block, switch (block->type) { case FLAC__METADATA_TYPE_STREAMINFO: - data->audio_format.bits = (int8_t)si->bits_per_sample; - data->audio_format.sample_rate = si->sample_rate; - data->audio_format.channels = (int8_t)si->channels; + audio_format_init(&data->audio_format, si->sample_rate, + si->bits_per_sample, si->channels); data->total_time = ((float)si->total_samples) / (si->sample_rate); break; case FLAC__METADATA_TYPE_VORBIS_COMMENT: |