From 7a939746ae4c68a0852796da8ed3efe1295c3a09 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Tue, 21 Nov 2023 20:32:39 +0100
Subject: [PATCH 1/2] increment version number to 0.23.15

---
 NEWS                        | 2 ++
 android/AndroidManifest.xml | 4 ++--
 meson.build                 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index ceb772b75..23cda989e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.23.15 (not yet released)
+
 ver 0.23.14 (2023/10/08)
 * decoder
   - flac: fix scanning files with non-ASCII names on Windows
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index cbe293389..447a68251 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="72"
-          android:versionName="0.23.14">
+          android:versionCode="73"
+          android:versionName="0.23.15">
 
   <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30"/>
 
diff --git a/meson.build b/meson.build
index 36869b5b9..8a15274e6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.23.14',
+  version: '0.23.15',
   meson_version: '>= 0.56.0',
   default_options: [
     'c_std=c11',

From 50c1e3738a672f933560247b5527d365d17b1c02 Mon Sep 17 00:00:00 2001
From: skidoo23 <skidoo@web.de>
Date: Tue, 21 Nov 2023 19:20:41 +0100
Subject: [PATCH 2/2] decoder/ffmpeg: Fix build error with ffmpeg 6.1

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1898
---
 NEWS                             | 2 ++
 src/decoder/plugins/FfmpegIo.cxx | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 23cda989e..48fa2401a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.23.15 (not yet released)
+* decoder
+  - ffmpeg: fix build failure with FFmpeg 6.1
 
 ver 0.23.14 (2023/10/08)
 * decoder
diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
index 5b5c8b40e..3c3323ce8 100644
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@@ -26,6 +26,9 @@
 
 extern "C" {
 #include <libavutil/mem.h>
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100)
+#include <libavutil/error.h>
+#endif
 }
 
 AvioStream::~AvioStream()