diff options
| author | Max Kellermann <max@musicpd.org> | 2021-05-31 18:08:58 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-05-31 18:10:06 +0200 |
| commit | ac59ec34f9d467b423b1f5f68bdfb2e7f2f944c3 (patch) | |
| tree | 2c5595ae07980a48f8ac3a2d0dcbffd8990fcf30 | |
| parent | 82da57b7cea06d461aa60b322ee217627041613b (diff) | |
decoder/ffmpeg: fix build failure with FFmpeg 3.4
av_demuxer_iterate() was added in libavformat 58.9.100.
Closes https://github.com/MusicPlayerDaemon/MPD/issues/1178
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -3,6 +3,7 @@ ver 0.22.9 (not yet released) - simple: load all .mpdignore files of all parent directories * decoder - ffmpeg: support the tags "sort_album", "album-sort", "artist-sort" + - ffmpeg: fix build failure with FFmpeg 3.4 * Windows - fix build failure with SQLite diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 891f7846a..c817277e1 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -659,6 +659,8 @@ ffmpeg_scan_stream(InputStream &is, TagHandler &handler) return FfmpegScanStream(*f, handler); } +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100) + static void ffmpeg_uri_decode(DecoderClient &client, const char *uri) { @@ -690,6 +692,8 @@ ffmpeg_protocols() noexcept return protocols; } +#endif + /** * A list of extensions found for the formats supported by ffmpeg. * This list is current as of 02-23-09; To find out if there are more @@ -813,6 +817,8 @@ static const char *const ffmpeg_mime_types[] = { constexpr DecoderPlugin ffmpeg_decoder_plugin = DecoderPlugin("ffmpeg", ffmpeg_decode, ffmpeg_scan_stream) .WithInit(ffmpeg_init, ffmpeg_finish) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100) .WithProtocols(ffmpeg_protocols, ffmpeg_uri_decode) +#endif .WithSuffixes(ffmpeg_suffixes) .WithMimeTypes(ffmpeg_mime_types); |