Skip to content

M
mpd
Commit 5b775ca5 authored by Sam Bazley's avatar Sam Bazley
Browse files
Options

decoder/ffmpeg: check if long_name is not null

parent ea95da3b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ 5b775ca5
...@@ -602,8 +602,12 @@ ffmpeg_decode(DecoderClient &client, InputStream &input) ...@@ -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) ...@@ -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);
} }
......
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