From: Michael Niedermayer <mich...@niedermayer.cc>
Previously errors could result in random entries to be lost.
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavutil/opt.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 4fd25ff..eae4f75 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -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;
}
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
