oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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
This commit is contained in:
Max Kellermann 2021-05-31 18:08:58 +02:00
parent 82da57b7ce
commit ac59ec34f9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -3,6 +3,7 @@ ver 0.22.9 (not yet released)
- simple: load all .mpdignore files of all parent directories - simple: load all .mpdignore files of all parent directories
* decoder * decoder
- ffmpeg: support the tags "sort_album", "album-sort", "artist-sort" - ffmpeg: support the tags "sort_album", "album-sort", "artist-sort"
- ffmpeg: fix build failure with FFmpeg 3.4
* Windows * Windows
- fix build failure with SQLite - fix build failure with SQLite

6
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -659,6 +659,8 @@ ffmpeg_scan_stream(InputStream &is, TagHandler &handler)
return FfmpegScanStream(*f, handler); return FfmpegScanStream(*f, handler);
} }
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100)
static void static void
ffmpeg_uri_decode(DecoderClient &client, const char *uri) ffmpeg_uri_decode(DecoderClient &client, const char *uri)
{ {
@ -690,6 +692,8 @@ ffmpeg_protocols() noexcept
return protocols; return protocols;
} }
#endif
/** /**
* A list of extensions found for the formats supported by ffmpeg. * 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 * 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 = constexpr DecoderPlugin ffmpeg_decoder_plugin =
DecoderPlugin("ffmpeg", ffmpeg_decode, ffmpeg_scan_stream) DecoderPlugin("ffmpeg", ffmpeg_decode, ffmpeg_scan_stream)
.WithInit(ffmpeg_init, ffmpeg_finish) .WithInit(ffmpeg_init, ffmpeg_finish)
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100)
.WithProtocols(ffmpeg_protocols, ffmpeg_uri_decode) .WithProtocols(ffmpeg_protocols, ffmpeg_uri_decode)
#endif
.WithSuffixes(ffmpeg_suffixes) .WithSuffixes(ffmpeg_suffixes)
.WithMimeTypes(ffmpeg_mime_types); .WithMimeTypes(ffmpeg_mime_types);