summaryrefslogtreecommitdiff
path: root/libavutil/dict.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2013-01-02 21:04:23 +0000
committerLuca Barbato <lu_zero@gentoo.org>2013-01-25 17:20:03 +0100
commit38c1466ca41c73c7ce347da702362cb69c151716 (patch)
treed797243061d8be4d957c8c06ce5efc16acb90234 /libavutil/dict.c
parent5ea5ffc9cee1b91eed471fff2f51d771222cf8d2 (diff)
downloadffmpeg-38c1466ca41c73c7ce347da702362cb69c151716.tar.gz
dict: add av_dict_parse_string()
Can be used to set multiple key/value pairs from a string. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavutil/dict.c')
-rw-r--r--libavutil/dict.c47
1 files changed, 47 insertions, 0 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c
index 3c3194c1bc..6532a56561 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -110,6 +110,53 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags
return 0;
}
+static int parse_key_value_pair(AVDictionary **pm, const char **buf,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags)
+{
+ char *key = av_get_token(buf, key_val_sep);
+ char *val = NULL;
+ int ret;
+
+ if (key && *key && strspn(*buf, key_val_sep)) {
+ (*buf)++;
+ val = av_get_token(buf, pairs_sep);
+ }
+
+ if (key && *key && val && *val)
+ ret = av_dict_set(pm, key, val, flags);
+ else
+ ret = AVERROR(EINVAL);
+
+ av_freep(&key);
+ av_freep(&val);
+
+ return ret;
+}
+
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags)
+{
+ int ret;
+
+ if (!str)
+ return 0;
+
+ /* ignore STRDUP flags */
+ flags &= ~(AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+ while (*str) {
+ if ((ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0)
+ return ret;
+
+ if (*str)
+ str++;
+ }
+
+ return 0;
+}
+
void av_dict_free(AVDictionary **pm)
{
AVDictionary *m = *pm;