Merge branch 'v0.22.x'

NEWS

@@ -5,6 +5,10 @@ ver 0.23 (not yet released)
 * output
   - snapcast: new plugin
 
+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
 

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="54"
-          android:versionName="0.22.6">
+          android:versionCode="55"
+          android:versionName="0.22.7">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 

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
 

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -464,6 +464,16 @@ FfmpegCheckTag(DecoderClient &client, InputStream *is,
 		client.SubmitTag(is, tag.Commit());
 }
 
+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
 FfmpegDecode(DecoderClient &client, InputStream *input,
 	     AVFormatContext &format_context)
@@ -521,7 +531,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);