etc
/
obs-StreamFX
mirror of https://github.com/Xaymar/obs-StreamFX
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-07-30 07:43:28 +02:00
parent 8382189bf8
commit c56562a562
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

@ -398,10 +398,12 @@ void tools::print_av_option_string2(AVCodecContext* ctx_codec, void* ctx_option,
// Find the unit for the option.
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;
for (auto* opt = unitopt;
(opt = av_opt_next(ctx_option, opt)) != nullptr && (strcmp(unitopt->unit, opt->unit) == 0);) {
for (auto* opt = unitopt; (opt = av_opt_next(ctx_option, opt)) != nullptr;) {
if (opt->unit && (strcmp(unitopt->unit, opt->unit) != 0))
continue;
if (opt->default_val.i64 == v)
optname = opt->name;
}