Unified · Split
| @@ -236,9 +236,9 @@ static int parse_features(AVFilterContext *ctx) · 235 unmodified lines | |||
| 236 | for (unsigned i = 0; i < dict_cnt; i++) { | 236 | for (unsigned i = 0; i < dict_cnt; i++) { |
| 237 | char *feature_name = NULL; | 237 | char *feature_name = NULL; |
| 238 | VmafFeatureDictionary *feature_opts_dict = NULL; | 238 | VmafFeatureDictionary *feature_opts_dict = NULL; |
| 239 | AVDictionaryEntry *e = NULL; | 239 | const AVDictionaryEntry *e = NULL; |
| 240 | 240 | ||
| 241 | while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { | 241 | while (e = av_dict_iterate(dict[i], e)) { |
| 242 | if (av_stristr(e->key, "name")) { | 242 | if (av_stristr(e->key, "name")) { |
| 243 | feature_name = e->value; | 243 | feature_name = e->value; |
| 244 | continue; | 244 | continue; |
| @@ -295,11 +295,11 @@ static int parse_models(AVFilterContext *ctx) · 50 unmodified lines | |||
| 295 | 295 | ||
| 296 | for (unsigned i = 0; i < dict_cnt; i++) { | 296 | for (unsigned i = 0; i < dict_cnt; i++) { |
| 297 | VmafModelConfig model_cfg = { 0 }; | 297 | VmafModelConfig model_cfg = { 0 }; |
| 298 | AVDictionaryEntry *e = NULL; | 298 | const AVDictionaryEntry *e = NULL; |
| 299 | char *version = NULL; | 299 | char *version = NULL; |
| 300 | char *path = NULL; | 300 | char *path = NULL; |
| 301 | 301 | ||
| 302 | while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { | 302 | while (e = av_dict_iterate(dict[i], e)) { |
| 303 | if (av_stristr(e->key, "disable_clip")) { | 303 | if (av_stristr(e->key, "disable_clip")) { |
| 304 | model_cfg.flags |= av_stristr(e->value, "true") ? | 304 | model_cfg.flags |= av_stristr(e->value, "true") ? |
| 305 | VMAF_MODEL_FLAG_DISABLE_CLIP : 0; | 305 | VMAF_MODEL_FLAG_DISABLE_CLIP : 0; |
| @@ -355,7 +355,7 @@ static int parse_models(AVFilterContext *ctx) · 49 unmodified lines | |||
| 355 | goto exit; | 355 | goto exit; |
| 356 | } | 356 | } |
| 357 | 357 | ||
| 358 | while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { | 358 | while (e = av_dict_iterate(dict[i], e)) { |
| 359 | VmafFeatureDictionary *feature_opts_dict = NULL; | 359 | VmafFeatureDictionary *feature_opts_dict = NULL; |
| 360 | char *feature_opt = NULL; | 360 | char *feature_opt = NULL; |
| 361 | 361 | ||