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/vorbis_plugin.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 '')
| -rw-r--r-- | src/decoder/vorbis_plugin.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index d4f81e91f..bab1d57ec 100644 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -324,8 +324,7 @@ vorbis_stream_decode(struct decoder *decoder, vorbis_info *vi = ov_info(&vf, -1); struct replay_gain_info *new_rgi; - audio_format.channels = vi->channels; - audio_format.sample_rate = vi->rate; + audio_format_init(&audio_format, vi->rate, 16, vi->channels); if (!audio_format_valid(&audio_format)) { g_warning("Invalid audio format: %u:%u:%u\n", |