generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dict: add AV_DICT_APPEND flag.

Browse Source
This commit is contained in:
Anton Khirnov 2011-06-04 18:43:05 +02:00
parent 25de5958c8
commit 1b9b37b8a4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/dict.c
View File

@ -19,6 +19,7 @@
*/ */
#include <strings.h> #include <strings.h>
#include "avstring.h"
#include "dict.h" #include "dict.h"
#include "internal.h" #include "internal.h"
#include "mem.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; AVDictionary *m = *pm;
AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags); AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags);
char *oldval = NULL;
if(!m) if(!m)
m = *pm = av_mallocz(sizeof(*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(tag) {
if (flags & AV_DICT_DONT_OVERWRITE) if (flags & AV_DICT_DONT_OVERWRITE)
return 0; return 0;
av_free(tag->value); if (flags & AV_DICT_APPEND)
oldval = tag->value;
else
av_free(tag->value);
av_free(tag->key); av_free(tag->key);
*tag = m->elems[--m->count]; *tag = m->elems[--m->count];
} else { } 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 ); m->elems[m->count].key = av_strdup(key );
if (flags & AV_DICT_DONT_STRDUP_VAL) { if (flags & AV_DICT_DONT_STRDUP_VAL) {
m->elems[m->count].value = value; 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 } else
m->elems[m->count].value = av_strdup(value); m->elems[m->count].value = av_strdup(value);
m->count++; m->count++;

2
libavutil/dict.h
View File

@ -29,6 +29,8 @@
#define AV_DICT_DONT_STRDUP_KEY 4 #define AV_DICT_DONT_STRDUP_KEY 4
#define AV_DICT_DONT_STRDUP_VAL 8 #define AV_DICT_DONT_STRDUP_VAL 8
#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries. #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 { typedef struct {
char *key; char *key;