Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-04-24 20:54:04 +02:00
2 changed files with 7 additions and 7 deletions

View File

@@ -81,7 +81,7 @@ pcm_stream_decode(DecoderClient &client, InputStream &is)
if (is_float)
audio_format.format = SampleFormat::FLOAT;
{
if (mime != nullptr) {
const auto mime_parameters = ParseMimeTypeParameters(mime);
/* MIME type parameters according to RFC 2586 */