Skip to content

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

decoder/ffmpeg: add missing nullptr checks

Fixes part 1 of https://github.com/MusicPlayerDaemon/MPD/issues/1490
parent 85f9863e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ f2a3dfd7
...@@ -384,7 +384,8 @@ static void ...@@ -384,7 +384,8 @@ static void
FfmpegParseMetaData(const AVStream &stream, FfmpegParseMetaData(const AVStream &stream,
ReplayGainInfo &rg, MixRampInfo &mr) ReplayGainInfo &rg, MixRampInfo &mr)
{ {
FfmpegParseMetaData(*stream.metadata, rg, mr); if (stream.metadata != nullptr)
FfmpegParseMetaData(*stream.metadata, rg, mr);
} }
static void static void
...@@ -393,7 +394,9 @@ FfmpegParseMetaData(const AVFormatContext &format_context, int audio_stream, ...@@ -393,7 +394,9 @@ FfmpegParseMetaData(const AVFormatContext &format_context, int audio_stream,
{ {
assert(audio_stream >= 0); 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], FfmpegParseMetaData(*format_context.streams[audio_stream],
rg, mr); rg, mr);
} }
......
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