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

decoder/ffmpeg: check if long_name is not null

Browse Source
This commit is contained in:
Sam Bazley 2021-07-28 15:59:23 +01:00
parent ea95da3b1a
commit 5b775ca5b4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,8 +602,12 @@ ffmpeg_decode(DecoderClient &client, InputStream &input)
FfmpegOpenInput(stream.io, input.GetURI(), nullptr); FfmpegOpenInput(stream.io, input.GetURI(), nullptr);
const auto *input_format = format_context->iformat; const auto *input_format = format_context->iformat;
FmtDebug(ffmpeg_domain, "detected input format '{}' ({})", if (input_format->long_name == nullptr)
input_format->name, input_format->long_name); FmtDebug(ffmpeg_domain, "detected input format '{}'",
input_format->name);
else
FmtDebug(ffmpeg_domain, "detected input format '{}' ({})",
input_format->name, input_format->long_name);
FfmpegDecode(client, &input, *format_context); FfmpegDecode(client, &input, *format_context);
} }
@ -668,8 +672,12 @@ ffmpeg_uri_decode(DecoderClient &client, const char *uri)
FfmpegOpenInput(nullptr, uri, nullptr); FfmpegOpenInput(nullptr, uri, nullptr);
const auto *input_format = format_context->iformat; const auto *input_format = format_context->iformat;
FmtDebug(ffmpeg_domain, "detected input format '{}' ({})", if (input_format->long_name == nullptr)
input_format->name, input_format->long_name); FmtDebug(ffmpeg_domain, "detected input format '{}'",
input_format->name);
else
FmtDebug(ffmpeg_domain, "detected input format '{}' ({})",
input_format->name, input_format->long_name);
FfmpegDecode(client, nullptr, *format_context); FfmpegDecode(client, nullptr, *format_context);
} }