aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-14 17:40:50 +0100
committerMax Kellermann <max@duempel.org>2009-12-14 17:40:50 +0100
commitc3085d7b6130f24c3a1675e902bffb23775d5c3e (patch)
tree9960c6e1dbbebd9b99f7cec3dab8e54f06ef8182 /src/decoder
parent179502fe93532a3686c08f07d9ef6effaaf4f25a (diff)
parent8f7bc70bf5e47da66e57e5606b978ba3ee975d89 (diff)
downloadmpd-c3085d7b6130f24c3a1675e902bffb23775d5c3e.tar.gz
mpd-c3085d7b6130f24c3a1675e902bffb23775d5c3e.tar.xz
mpd-c3085d7b6130f24c3a1675e902bffb23775d5c3e.zip
Merge branch 'v0.15.x'
Conflicts: src/decoder/ffmpeg_plugin.c
Diffstat (limited to 'src/decoder')
-rw-r--r--src/decoder/ffmpeg_plugin.c4
-rw-r--r--src/decoder/wavpack_plugin.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index af9320322..d9a5f7feb 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -311,10 +311,6 @@ ffmpeg_decode_internal(struct ffmpeg_context *ctx)
total_time = 0;
- if (codec_context->channels > 2) {
- codec_context->channels = 2;
- }
-
if (!audio_format_init_checked(&audio_format,
codec_context->sample_rate,
ffmpeg_sample_format(codec_context),
diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c
index dffa078f9..68a958788 100644
--- a/src/decoder/wavpack_plugin.c
+++ b/src/decoder/wavpack_plugin.c
@@ -74,7 +74,7 @@ format_samples_int(int bytes_per_sample, void *buffer, uint32_t count)
switch (bytes_per_sample) {
case 1: {
- uchar *dst = buffer;
+ int8_t *dst = buffer;
/*
* The asserts like the following one are because we do the
* formatting of samples within a single buffer. The size