diff options
| author | Thilo Borgmann <thilo.borgmann@mail.de> | 2016-03-12 14:52:17 +0100 |
|---|---|---|
| committer | Thilo Borgmann <thilo.borgmann@mail.de> | 2016-03-25 17:08:11 +0100 |
| commit | 4ebf0b109cdb4daa888d69e8294621948168c46c (patch) | |
| tree | dfeb966900d2b5978f8d35f1d5f3cb2113a8bf41 /libavutil | |
| parent | 277408b7f16eeea60f1f7850638373307f967616 (diff) | |
| download | ffmpeg-4ebf0b109cdb4daa888d69e8294621948168c46c.tar.gz | |
lavu/dict: Add new flag to allow multiple equal keys.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/dict.c | 5 | ||||
| -rw-r--r-- | libavutil/dict.h | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index 12035627f9..3b509a41c7 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -70,9 +70,12 @@ 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); + AVDictionaryEntry *tag = NULL; char *oldval = NULL, *copy_key = NULL, *copy_value = NULL; + if (!(flags & AV_DICT_MULTIKEY)) { + tag = av_dict_get(m, key, NULL, flags); + } if (flags & AV_DICT_DONT_STRDUP_KEY) copy_key = (void *)key; else diff --git a/libavutil/dict.h b/libavutil/dict.h index 542d540f9f..118f1f00ed 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -76,6 +76,7 @@ #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. */ +#define AV_DICT_MULTIKEY 64 /**< Allow to store several equal keys in the dictionary */ typedef struct AVDictionaryEntry { char *key; @@ -121,8 +122,8 @@ int av_dict_count(const AVDictionary *m); * * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL * a dictionary struct is allocated and put in *pm. - * @param key entry key to add to *pm (will be av_strduped depending on flags) - * @param value entry value to add to *pm (will be av_strduped depending on flags). + * @param key entry key to add to *pm (will either be av_strduped or added as a new key depending on flags) + * @param value entry value to add to *pm (will be av_strduped or added as a new key depending on flags). * Passing a NULL value will cause an existing entry to be deleted. * @return >= 0 on success otherwise an error code <0 */ |