Merge branch 'fix-hls-seeking' of https://github.com/burrocargado/MPD into v0.23.x

This commit is contained in:
Max Kellermann 2022-05-09 22:44:10 +02:00
commit 112fcd206d
2 changed files with 4 additions and 4 deletions

1
NEWS
View File

@ -2,6 +2,7 @@ ver 0.23.7 (not yet released)
* database
- upnp: support pupnp 1.14
* decoder
- ffmpeg: fix HLS seeking
- opus: fix missing song length on high-latency files
* output
- shout: require at least libshout 2.4.0

View File

@ -471,7 +471,7 @@ 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;
return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) == 0;
#else
(void)format_context;
return false;
@ -533,9 +533,8 @@ FfmpegDecode(DecoderClient &client, InputStream *input,
: FromFfmpegTimeChecked(format_context.duration, AV_TIME_BASE_Q);
client.Ready(audio_format,
input
? input->IsSeekable()
: IsSeekable(format_context),
(input ? input->IsSeekable() : false)
|| IsSeekable(format_context),
total_time);
FfmpegParseMetaData(client, format_context, audio_stream);