avfilter/vf_libvmaf: use av_dict_iterate

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/388/head
Marvin Scholz 2 years ago committed by Andreas Rheinhardt
parent 734acfde4c
commit 492b45cb19
  1. 10
      libavfilter/vf_libvmaf.c

@ -236,9 +236,9 @@ static int parse_features(AVFilterContext *ctx)
for (unsigned i = 0; i < dict_cnt; i++) { for (unsigned i = 0; i < dict_cnt; i++) {
char *feature_name = NULL; char *feature_name = NULL;
VmafFeatureDictionary *feature_opts_dict = NULL; VmafFeatureDictionary *feature_opts_dict = NULL;
AVDictionaryEntry *e = NULL; const AVDictionaryEntry *e = NULL;
while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { while (e = av_dict_iterate(dict[i], e)) {
if (av_stristr(e->key, "name")) { if (av_stristr(e->key, "name")) {
feature_name = e->value; feature_name = e->value;
continue; continue;
@ -295,11 +295,11 @@ static int parse_models(AVFilterContext *ctx)
for (unsigned i = 0; i < dict_cnt; i++) { for (unsigned i = 0; i < dict_cnt; i++) {
VmafModelConfig model_cfg = { 0 }; VmafModelConfig model_cfg = { 0 };
AVDictionaryEntry *e = NULL; const AVDictionaryEntry *e = NULL;
char *version = NULL; char *version = NULL;
char *path = NULL; char *path = NULL;
while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { while (e = av_dict_iterate(dict[i], e)) {
if (av_stristr(e->key, "disable_clip")) { if (av_stristr(e->key, "disable_clip")) {
model_cfg.flags |= av_stristr(e->value, "true") ? model_cfg.flags |= av_stristr(e->value, "true") ?
VMAF_MODEL_FLAG_DISABLE_CLIP : 0; VMAF_MODEL_FLAG_DISABLE_CLIP : 0;
@ -355,7 +355,7 @@ static int parse_models(AVFilterContext *ctx)
goto exit; goto exit;
} }
while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { while (e = av_dict_iterate(dict[i], e)) {
VmafFeatureDictionary *feature_opts_dict = NULL; VmafFeatureDictionary *feature_opts_dict = NULL;
char *feature_opt = NULL; char *feature_opt = NULL;

Loading…
Cancel
Save