mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-27 13:10:37 +00:00
avutil/opt: check for and handle errors in av_opt_set_dict2()
Previously errors could result in random entries to be lost. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
2e31434d84
commit
f3ace85d88
@ -1476,10 +1476,11 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags)
|
||||
while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) {
|
||||
ret = av_opt_set(obj, t->key, t->value, search_flags);
|
||||
if (ret == AVERROR_OPTION_NOT_FOUND)
|
||||
av_dict_set(&tmp, t->key, t->value, 0);
|
||||
else if (ret < 0) {
|
||||
ret = av_dict_set(&tmp, t->key, t->value, 0);
|
||||
if (ret < 0) {
|
||||
av_log(obj, AV_LOG_ERROR, "Error setting option %s to value %s.\n", t->key, t->value);
|
||||
break;
|
||||
av_dict_free(&tmp);
|
||||
return ret;
|
||||
}
|
||||
ret = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user