[FFmpeg-devel] [PATCH 4/4] lavu/opt: copy dict in av_opt_copy

Lukasz Marek lukasz.m.luki2 at gmail.com
Sat Nov 8 18:13:53 CET 2014


Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
---
 libavutil/opt.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 0692393..86d3ddf 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1596,6 +1596,13 @@ int av_opt_copy(void *dst, void *src)
             *(int*)(field_dst8 + 1) = len;
         } else if (o->type == AV_OPT_TYPE_CONST) {
             // do nothing
+        } else if (o->type == AV_OPT_TYPE_DICT) {
+            if (*field_dst8 != *field_src8)
+                av_dict_free(field_dst8);
+            *field_dst8 = NULL;
+            av_dict_copy(field_dst8, *field_src8, 0);
+            if (av_dict_count(*field_src8) != av_dict_count(*field_dst8))
+                ret = AVERROR(ENOMEM);
         } else {
             memcpy(field_dst, field_src, opt_size(o->type));
         }
-- 
1.9.1



More information about the ffmpeg-devel mailing list