Merge branch 'v0.23.x'

2023-11-21 20:37:46 +01:00 · 2023-11-21 20:37:46 +01:00 · 5ab2c31500
parent 68b19ae087 50c1e3738a
commit 5ab2c31500
3 changed files with 9 additions and 2 deletions
--- a/4
+++ b/4
@ -49,6 +49,10 @@ ver 0.24 (not yet released)
 * remove Boost dependency
 * require libfmt 7 or later

+ver 0.23.15 (not yet released)
+* decoder
+  - ffmpeg: fix build failure with FFmpeg 6.1
+
 ver 0.23.14 (2023/10/08)
 * decoder
  - flac: fix scanning files with non-ASCII names on Windows
--- 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"/>

--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@ -10,6 +10,9 @@

 extern "C" {
 #include <libavutil/mem.h>
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100)
+#include <libavutil/error.h>
+#endif
 }

 AvioStream::~AvioStream()