avutil/opt: try to fix the case where src==dst in av_opt_copy()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 7cd6d61da5
parent fa6716c66d
commit 7cd6d61da5
1 changed files with 3 additions and 1 deletions
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@ -1559,7 +1559,9 @@ int av_opt_copy(void *dst, void *src)
        uint8_t **field_src8 = (uint8_t**)field_src;

        if (o->type == AV_OPT_TYPE_STRING) {
-            set_string(dst, o, *field_src8, field_dst8);
+            if (*field_dst8 != *field_src8)
+                av_freep(field_dst8);
+            *field_dst8 = av_strdup(*field_src8);
            if (*field_src8 && !*field_dst8)
                ret = AVERROR(ENOMEM);
        } else if (o->type == AV_OPT_TYPE_BINARY) {