From 85427826aaa0746c4eae28b62ca03977038d5022 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Feb 2021 14:35:56 +0100 Subject: [PATCH 1/3] increment version number to 0.22.7 --- NEWS | 2 ++ android/AndroidManifest.xml | 4 ++-- doc/conf.py | 2 +- meson.build | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index d751cf09a..47d6b7b98 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.22.7 (not yet released) + ver 0.22.6 (2021/02/16) * fix missing tags on songs in queue diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index e5624c7dd..bf659dc64 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="55" + android:versionName="0.22.7"> diff --git a/doc/conf.py b/doc/conf.py index ecbee92c1..4d59eb749 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -38,7 +38,7 @@ author = 'Max Kellermann' # built documents. # # The short X.Y version. -version = '0.22.6' +version = '0.22.7' # The full version, including alpha/beta/rc tags. release = version diff --git a/meson.build b/meson.build index c709eec70..2dbbc9b4a 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'mpd', ['c', 'cpp'], - version: '0.22.6', + version: '0.22.7', meson_version: '>= 0.49.0', default_options: [ 'c_std=c11', From a9ad8fa505c7f8c398c0c92ab323089576b5f878 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 22 Feb 2021 13:33:24 +0100 Subject: [PATCH 2/3] decoder/ffmpeg: move code to IsSeekable(AVFormatContext) --- src/decoder/plugins/FfmpegDecoderPlugin.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index e82bff450..b274ae4fb 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -464,6 +464,12 @@ FfmpegCheckTag(DecoderClient &client, InputStream *is, client.SubmitTag(is, tag.Commit()); } +static bool +IsSeekable(const AVFormatContext &format_context) noexcept +{ + return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) != 0; +} + static void FfmpegDecode(DecoderClient &client, InputStream *input, AVFormatContext &format_context) @@ -521,7 +527,7 @@ FfmpegDecode(DecoderClient &client, InputStream *input, client.Ready(audio_format, input ? input->IsSeekable() - : (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) != 0, + : IsSeekable(format_context), total_time); FfmpegParseMetaData(client, format_context, audio_stream); From 6eba621045dd181472b9cda1043d5b8af10e2de5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 22 Feb 2021 13:36:08 +0100 Subject: [PATCH 3/3] decoder/ffmpeg: fix build problem with FFmpeg 3.4 Regression by commit a22d1c88d7e11bfdc553f38a86d416783421c7e4 Closes https://github.com/MusicPlayerDaemon/MPD/issues/1097 --- NEWS | 2 ++ src/decoder/plugins/FfmpegDecoderPlugin.cxx | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 47d6b7b98..47e7f1be4 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.22.7 (not yet released) +* decoder + - ffmpeg: fix build problem with FFmpeg 3.4 ver 0.22.6 (2021/02/16) * fix missing tags on songs in queue diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index b274ae4fb..889062ee6 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -467,7 +467,11 @@ FfmpegCheckTag(DecoderClient &client, InputStream *is, static bool IsSeekable(const AVFormatContext &format_context) noexcept { +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 6, 100) return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) != 0; +#else + return false; +#endif } static void