Skip to content

M
mpd
Commit 112fcd20 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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

parents c3d393f2 11d1f560
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
NEWS
View file @ 112fcd20
...@@ -2,6 +2,7 @@ ver 0.23.7 (not yet released) ...@@ -2,6 +2,7 @@ ver 0.23.7 (not yet released)
* database * database
- upnp: support pupnp 1.14 - upnp: support pupnp 1.14
* decoder * decoder
- ffmpeg: fix HLS seeking
- opus: fix missing song length on high-latency files - opus: fix missing song length on high-latency files
* output * output
- shout: require at least libshout 2.4.0 - shout: require at least libshout 2.4.0
......
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ 112fcd20
...@@ -471,7 +471,7 @@ static bool ...@@ -471,7 +471,7 @@ static bool
IsSeekable(const AVFormatContext &format_context) noexcept IsSeekable(const AVFormatContext &format_context) noexcept
{ {
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 6, 100) #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 #else
(void)format_context; (void)format_context;
return false; return false;
...@@ -533,9 +533,8 @@ FfmpegDecode(DecoderClient &client, InputStream *input, ...@@ -533,9 +533,8 @@ FfmpegDecode(DecoderClient &client, InputStream *input,
: FromFfmpegTimeChecked(format_context.duration, AV_TIME_BASE_Q); : FromFfmpegTimeChecked(format_context.duration, AV_TIME_BASE_Q);
client.Ready(audio_format, client.Ready(audio_format,
input (input ? input->IsSeekable() : false)
? input->IsSeekable() || IsSeekable(format_context),
: IsSeekable(format_context),
total_time); total_time);
FfmpegParseMetaData(client, format_context, audio_stream); FfmpegParseMetaData(client, format_context, audio_stream);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment