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

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann 2017-04-24 20:54:04 +02:00
commit 8b0269c264
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/build/libs.py
View File

@ -58,8 +58,8 @@ libmad = AutotoolsProject(
) )
ffmpeg = FfmpegProject( ffmpeg = FfmpegProject(
'http://ffmpeg.org/releases/ffmpeg-3.2.4.tar.xz', 'http://ffmpeg.org/releases/ffmpeg-3.3.tar.xz',
'6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a', '599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d',
'lib/libavcodec.a', 'lib/libavcodec.a',
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',
@ -82,8 +82,8 @@ ffmpeg = FfmpegProject(
) )
curl = AutotoolsProject( curl = AutotoolsProject(
'http://curl.haxx.se/download/curl-7.52.1.tar.lzma', 'http://curl.haxx.se/download/curl-7.54.0.tar.lzma',
'44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365', 'cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a',
'lib/libcurl.a', 'lib/libcurl.a',
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',
@ -103,7 +103,7 @@ curl = AutotoolsProject(
) )
boost = BoostProject( boost = BoostProject(
'http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2', 'http://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.bz2',
'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0', '7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332',
'include/boost/version.hpp', 'include/boost/version.hpp',
) )

2
src/decoder/plugins/PcmDecoderPlugin.cxx
View File

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