[FFmpeg-cvslog] lavu/opt: use AV_DICT_MULTIKEY in av_opt_set_dict2()

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Jan 29 22:13:33 2023 +0100| [5c36f4ef8410008d508b9ca348441903a15a6f7c] | committer: Anton Khirnov

lavu/opt: use AV_DICT_MULTIKEY in av_opt_set_dict2()

If the dictionary provided on input contains multiple entries for an
option (relevant for flags modifying the previous value with '+' or
'-') and the option is not found in the target object, only the last
entry would be returned to the caller.

Pass AV_DICT_MULTIKEY to av_dict_set() to make sure all such entries are
returned.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c36f4ef8410008d508b9ca348441903a15a6f7c
---

 libavutil/opt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 0a909a8b22..0908751752 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1752,7 +1752,7 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags)
     while ((t = av_dict_iterate(*options, t))) {
         ret = av_opt_set(obj, t->key, t->value, search_flags);
         if (ret == AVERROR_OPTION_NOT_FOUND)
-            ret = av_dict_set(&tmp, t->key, t->value, 0);
+            ret = av_dict_set(&tmp, t->key, t->value, AV_DICT_MULTIKEY);
         if (ret < 0) {
             av_log(obj, AV_LOG_ERROR, "Error setting option %s to value %s.\n", t->key, t->value);
             av_dict_free(&tmp);