oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.15.x'

Browse Source 
Conflicts:
	src/decoder/ffmpeg_plugin.c
This commit is contained in:
Max Kellermann
2009-12-14 17:40:50 +01:00
parent 179502fe93 8f7bc70bf5
commit c3085d7b61
9 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder/ffmpeg_plugin.c
View File

@@ -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),

2
src/decoder/wavpack_plugin.c
View File

@@ -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