diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 967ae605e..b15aab225 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -678,23 +678,19 @@ FfmpegScanStream(AVFormatContext &format_context, static bool ffmpeg_scan_stream(InputStream &is, TagHandler &handler) noexcept -{ +try { AvioStream stream(nullptr, is); if (!stream.Open()) return false; - AVFormatContext *f; - try { - f = FfmpegOpenInput(stream.io, is.GetURI(), nullptr); - } catch (...) { - return false; - } - + AVFormatContext *f = FfmpegOpenInput(stream.io, is.GetURI(), nullptr); AtScopeExit(&f) { avformat_close_input(&f); }; return FfmpegScanStream(*f, handler); +} catch (...) { + return false; } /**