etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-29 11:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

ffmpeg/tools: Ensure we aren't comparing against a nullptr

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-07-30 07:43:28 +02:00
parent dbb9db596e
commit f3b3af2030
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/ffmpeg/tools.cpp
View file

@ -359,10 +359,12 @@ void tools::print_av_option_string2(AVCodecContext* ctx_codec, void* ctx_option,
// Find the unit for the option. // Find the unit for the option.
auto* unitopt = av_opt_find(ctx_option, option.data(), nullptr, 0, AV_OPT_SEARCH_CHILDREN); auto* unitopt = av_opt_find(ctx_option, option.data(), nullptr, 0, AV_OPT_SEARCH_CHILDREN);
if (unitopt) { if (unitopt && unitopt->unit) {
std::string_view optname; std::string_view optname;
for (auto* opt = unitopt; for (auto* opt = unitopt; (opt = av_opt_next(ctx_option, opt)) != nullptr;) {
(opt = av_opt_next(ctx_option, opt)) != nullptr && (strcmp(unitopt->unit, opt->unit) == 0);) { if (opt->unit && (strcmp(unitopt->unit, opt->unit) != 0))
continue;
if (opt->default_val.i64 == v) if (opt->default_val.i64 == v)
optname = opt->name; optname = opt->name;
} }