From a00d4120087cbc50543ba7c91e574f066ce130c0 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 23 Aug 2017 17:43:49 +0200
Subject: [PATCH 1/6] player/Thread: initialize play_audio_format, fixes
assertion
This fixes an assertion failure caused by resuming playback before the
decoder has finished startup.
---
NEWS | 1 +
src/player/Thread.cxx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 6c1ac7d82..d7801060a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ ver 0.20.10 (not yet released)
- aiff: fix FORM chunk size endianess (is big-endian)
* mixer
- osx: add a mixer for OSX.
+* fix crash when resuming playback before decoder is ready
* fix crash on Windows
ver 0.20.9 (2017/06/04)
diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index 4cbe1653b..923e5ee59 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -135,7 +135,7 @@ class Player {
/**
* The current audio format for the audio outputs.
*/
- AudioFormat play_audio_format;
+ AudioFormat play_audio_format = AudioFormat::Undefined();
/**
* The time stamp of the chunk most recently sent to the
From 07d8259ad63e8218db05d700cba79af00752e952 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 23 Aug 2017 17:46:25 +0200
Subject: [PATCH 2/6] python/libs: upgrade Boost to 1.65
---
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 1bc22639e..8ac96f040 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -114,7 +114,7 @@ curl = AutotoolsProject(
)
boost = BoostProject(
- 'http://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.bz2',
- '7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332',
+ 'http://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2',
+ 'ea26712742e2fb079c2a566a31f3266973b76e38222b9f88b387e3c8b2f9902c',
'include/boost/version.hpp',
)
From bf8d2f93d225b601f2c7fd6ce5c27a8da4288de8 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 24 Aug 2017 08:59:12 +0200
Subject: [PATCH 3/6] python/build/libs: upgrade FFmpeg to 3.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 8ac96f040..399ed4aae 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -69,8 +69,8 @@ liblame = AutotoolsProject(
)
ffmpeg = FfmpegProject(
- 'http://ffmpeg.org/releases/ffmpeg-3.3.2.tar.xz',
- '1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785',
+ 'http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.xz',
+ 'd2a9002cdc6b533b59728827186c044ad02ba64841f1b7cd6c21779875453a1e',
'lib/libavcodec.a',
[
'--disable-shared', '--enable-static',
From 811cabf8a9687541a41fbc0e7cec07a0522c5036 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 24 Aug 2017 09:00:25 +0200
Subject: [PATCH 4/6] python/libs: upgrade Opus to 1.2.1
---
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 399ed4aae..ee4c82b72 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -19,8 +19,8 @@ libvorbis = AutotoolsProject(
)
opus = AutotoolsProject(
- 'http://downloads.xiph.org/releases/opus/opus-1.1.4.tar.gz',
- '9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692',
+ 'https://archive.mozilla.org/pub/opus/opus-1.2.1.tar.gz',
+ 'cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732',
'lib/libopus.a',
['--disable-shared', '--enable-static'],
)
From cc76aeb7bb6d63f71bf39c5d688d81012c5d5b51 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 24 Aug 2017 08:58:28 +0200
Subject: [PATCH 5/6] python/build/libs: upgrade CURL to 7.55.1
---
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 ee4c82b72..0dd950dbf 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -93,8 +93,8 @@ ffmpeg = FfmpegProject(
)
curl = AutotoolsProject(
- 'http://curl.haxx.se/download/curl-7.54.1.tar.lzma',
- '2b7af34d4900887e0b4e0a9f545b9511ff774d07151ae4976485060d3e1bdb6e',
+ 'http://curl.haxx.se/download/curl-7.55.1.tar.xz',
+ '3eafca6e84ecb4af5f35795dee84e643d5428287e88c041122bb8dac18676bb7',
'lib/libcurl.a',
[
'--disable-shared', '--enable-static',
From 57a71c157d396a1c74f55db3db5fbf07cd812e27 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 24 Aug 2017 09:15:43 +0200
Subject: [PATCH 6/6] release v0.20.10
---
NEWS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index d7801060a..803ccfcfe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-ver 0.20.10 (not yet released)
+ver 0.20.10 (2017/08/24)
* decoder
- ffmpeg: support MusicBrainz ID3v2 tags
* tags