diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-06-04 18:43:05 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-06-16 20:24:56 +0200 |
| commit | 1b9b37b8a416e77b4c6425dcdcee21cf8a1f5d67 (patch) | |
| tree | 5c6bf4eb04ef6c8a74cce412b8f2c5196d787aee | |
| parent | 25de5958c8fd727777ebf8c4f7a9df6f9b8eb82d (diff) | |
| download | ffmpeg-1b9b37b8a416e77b4c6425dcdcee21cf8a1f5d67.tar.gz | |
dict: add AV_DICT_APPEND flag.
| -rw-r--r-- | libavutil/dict.c | 13 | ||||
| -rw-r--r-- | libavutil/dict.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index 56f1513d32..3ea7e55b30 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -19,6 +19,7 @@ */ #include <strings.h> +#include "avstring.h" #include "dict.h" #include "internal.h" #include "mem.h" @@ -51,6 +52,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags { AVDictionary *m = *pm; AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags); + char *oldval = NULL; if(!m) m = *pm = av_mallocz(sizeof(*m)); @@ -58,7 +60,10 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags if(tag) { if (flags & AV_DICT_DONT_OVERWRITE) return 0; - av_free(tag->value); + if (flags & AV_DICT_APPEND) + oldval = tag->value; + else + av_free(tag->value); av_free(tag->key); *tag = m->elems[--m->count]; } else { @@ -75,6 +80,12 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags m->elems[m->count].key = av_strdup(key ); if (flags & AV_DICT_DONT_STRDUP_VAL) { m->elems[m->count].value = value; + } else if (oldval && flags & AV_DICT_APPEND) { + int len = strlen(oldval) + strlen(value) + 1; + if (!(oldval = av_realloc(oldval, len))) + return AVERROR(ENOMEM); + av_strlcat(oldval, value, len); + m->elems[m->count].value = oldval; } else m->elems[m->count].value = av_strdup(value); m->count++; diff --git a/libavutil/dict.h b/libavutil/dict.h index bfd7f2682c..ff24b36f81 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -29,6 +29,8 @@ #define AV_DICT_DONT_STRDUP_KEY 4 #define AV_DICT_DONT_STRDUP_VAL 8 #define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries. +#define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no + delimiter is added, the strings are simply concatenated. */ typedef struct { char *key; |