From 16123f1b8e832ad1743e9ab24bd7c7663411bfa4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 30 Nov 2009 09:59:05 +0100 Subject: ffmpeg: don't try to force stereo The plugin code tried to force libavcodec to supply stereo samples. That however has never actually worked. By removing this code, we are able to play surround files for the first time. --- src/decoder/ffmpeg_plugin.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index b9aafaf7b..86c20a882 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -289,10 +289,6 @@ ffmpeg_decode_internal(struct ffmpeg_context *ctx) total_time = 0; - if (codec_context->channels > 2) { - codec_context->channels = 2; - } - #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(41<<8)+0) audio_format.bits = (uint8_t) av_get_bits_per_sample_format(codec_context->sample_fmt); #else -- cgit v1.2.3 From 8f7bc70bf5e47da66e57e5606b978ba3ee975d89 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 11 Dec 2009 12:45:57 +0100 Subject: decoder/wavpack: don't use the nonstandard "uchar" type Use the signed C99 type int8_t instead. --- src/decoder/wavpack_plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/decoder') diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index 821536fb5..645c8962e 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -72,7 +72,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 -- cgit v1.2.3