Skip to content

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

decoder/ffmpeg: wider try/catch in ffmpeg_scan_stream()

parent bce608cd
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ 0256bbbb
...@@ -678,23 +678,19 @@ FfmpegScanStream(AVFormatContext &format_context, ...@@ -678,23 +678,19 @@ FfmpegScanStream(AVFormatContext &format_context,
static bool static bool
ffmpeg_scan_stream(InputStream &is, TagHandler &handler) noexcept ffmpeg_scan_stream(InputStream &is, TagHandler &handler) noexcept
{ try {
AvioStream stream(nullptr, is); AvioStream stream(nullptr, is);
if (!stream.Open()) if (!stream.Open())
return false; return false;
AVFormatContext *f; AVFormatContext *f = FfmpegOpenInput(stream.io, is.GetURI(), nullptr);
try {
f = FfmpegOpenInput(stream.io, is.GetURI(), nullptr);
} catch (...) {
return false;
}
AtScopeExit(&f) { AtScopeExit(&f) {
avformat_close_input(&f); avformat_close_input(&f);
}; };
return FfmpegScanStream(*f, handler); return FfmpegScanStream(*f, handler);
} catch (...) {
return false;
} }
/** /**
......
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