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/mikmod_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/mikmod_plugin.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/decoder/mikmod_plugin.c b/src/decoder/mikmod_plugin.c index 065c34319..e7b7bfb03 100644 --- a/src/decoder/mikmod_plugin.c +++ b/src/decoder/mikmod_plugin.c @@ -175,9 +175,7 @@ mod_decode(struct decoder *decoder, const char *path) return; } - audio_format.bits = 16; - audio_format.sample_rate = 44100; - audio_format.channels = 2; + audio_format_init(&audio_format, 44100, 16, 2); secPerByte = 1.0 / ((audio_format.bits * audio_format.channels / 8.0) * |