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

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

Browse Source
This commit is contained in:
Max Kellermann 2019-03-13 00:27:03 +01:00
parent bce608cdbc
commit 0256bbbbaf
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
} }
/** /**