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

Merge branch 'v0.23.x'

Browse Source
This commit is contained in:
Max Kellermann
2022-04-26 21:05:39 +02:00
parent 9e1b24f3a1 c3d393f214
commit 6e1500c251
8 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,7 +384,8 @@ static void
FfmpegParseMetaData(const AVStream &stream,
ReplayGainInfo &rg, MixRampInfo &mr)
{
FfmpegParseMetaData(*stream.metadata, rg, mr);
if (stream.metadata != nullptr)
FfmpegParseMetaData(*stream.metadata, rg, mr);
}
static void
@@ -393,7 +394,9 @@ FfmpegParseMetaData(const AVFormatContext &format_context, int audio_stream,
{
assert(audio_stream >= 0);
FfmpegParseMetaData(*format_context.metadata, rg, mr);
if (format_context.metadata != nullptr)
FfmpegParseMetaData(*format_context.metadata, rg, mr);
FfmpegParseMetaData(*format_context.streams[audio_stream],
rg, mr);
}