aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/mpcdec_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-07-19 18:18:32 +0200
committerMax Kellermann <max@duempel.org>2009-07-19 18:18:32 +0200
commitc9d43b4d713d508b6f5b67cfffba9296f9436934 (patch)
tree70100c28e365a244f5c6a361d2ecda332df2a756 /src/decoder/mpcdec_plugin.c
parentc5ec035fb4a533ebd9f8c69b085604560d2a5487 (diff)
parent49ede85827c095d0a6ead0ecb63e83e000a76d4f (diff)
downloadmpd-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/mpcdec_plugin.c')
-rw-r--r--src/decoder/mpcdec_plugin.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/decoder/mpcdec_plugin.c b/src/decoder/mpcdec_plugin.c
index 26349f93a..a684da104 100644
--- a/src/decoder/mpcdec_plugin.c
+++ b/src/decoder/mpcdec_plugin.c
@@ -193,9 +193,7 @@ mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is)
mpc_demux_get_info(demux, &info);
#endif
- audio_format.bits = 24;
- audio_format.channels = info.channels;
- audio_format.sample_rate = info.sample_freq;
+ audio_format_init(&audio_format, info.sample_freq, 24, info.channels);
if (!audio_format_valid(&audio_format)) {
#ifndef MPC_IS_OLD_API