From 6b60d1e71f967792e7e3936ea58c4218fbbf01b9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Apr 2017 20:36:55 +0200 Subject: [PATCH 1/4] decoder/pcm: add missing nullptr check Fixes a potential crash bug which is actually unreachable, because the "pcm" plugin is never invoked when there is no (matching) MIME type. --- src/decoder/plugins/PcmDecoderPlugin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx index a74db186b..32d4fd133 100644 --- a/src/decoder/plugins/PcmDecoderPlugin.cxx +++ b/src/decoder/plugins/PcmDecoderPlugin.cxx @@ -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 */ From 3cdf965fbab4bb27490dbb37bcbcc0acb2a8a2f9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Apr 2017 20:41:08 +0200 Subject: [PATCH 2/4] python/build/libs: upgrade FFmpeg to 3.3 --- python/build/libs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/build/libs.py b/python/build/libs.py index 7f757d93c..a11351072 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -58,8 +58,8 @@ libmad = AutotoolsProject( ) ffmpeg = FfmpegProject( - 'http://ffmpeg.org/releases/ffmpeg-3.2.4.tar.xz', - '6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a', + 'http://ffmpeg.org/releases/ffmpeg-3.3.tar.xz', + '599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d', 'lib/libavcodec.a', [ '--disable-shared', '--enable-static', From edaa7d774855b03619b736455def001d83a6505e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Apr 2017 20:42:28 +0200 Subject: [PATCH 3/4] python/build/libs: upgrade CURL to 7.54.0 --- python/build/libs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/build/libs.py b/python/build/libs.py index a11351072..ea150b310 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -82,8 +82,8 @@ ffmpeg = FfmpegProject( ) curl = AutotoolsProject( - 'http://curl.haxx.se/download/curl-7.52.1.tar.lzma', - '44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365', + 'http://curl.haxx.se/download/curl-7.54.0.tar.lzma', + 'cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a', 'lib/libcurl.a', [ '--disable-shared', '--enable-static', From ac2e4e593d407e41db49fdb9ae2da6bc1557f618 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Apr 2017 20:43:04 +0200 Subject: [PATCH 4/4] python/libs: upgrade Boost to 1.64 --- python/build/libs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/build/libs.py b/python/build/libs.py index ea150b310..7db98bed4 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -103,7 +103,7 @@ curl = AutotoolsProject( ) boost = BoostProject( - 'http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2', - 'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0', + 'http://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.bz2', + '7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332', 'include/boost/version.hpp', )