aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--doc/APIchanges4
-rw-r--r--libavutil/dict.c47
-rw-r--r--libavutil/dict.h17
-rw-r--r--libavutil/version.h2
4 files changed, 69 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 79e3cb79a0..71fb0206d6 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil: 2012-10-22
API changes, most recent first:
+2013-xx-xx - xxxxxxx - lavu 52.7.0 - dict.h
+ Add av_dict_parse_string() to set multiple key/value pairs at once from a
+ string.
+
2013-01-xx - xxxxxxx - lavu 52.6.0 - avstring.h
Add av_strnstr()
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;
diff --git a/libavutil/dict.h b/libavutil/dict.h
index 492da9a41c..ab23f26e6f 100644
--- a/libavutil/dict.h
+++ b/libavutil/dict.h
@@ -107,6 +107,23 @@ int av_dict_count(const AVDictionary *m);
int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
/**
+ * Parse the key/value pairs list and add to a dictionary.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @param flags flags to use when adding to dictionary.
+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
+ * are ignored since the key/value tokens will always
+ * be duplicated.
+ * @return 0 on success, negative AVERROR code on failure
+ */
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags);
+
+/**
* Copy entries from one AVDictionary struct into another.
* @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
* this function will allocate a struct for you and put it in *dst
diff --git a/libavutil/version.h b/libavutil/version.h
index 4c9651fae2..a23fdd2e47 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -37,7 +37,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 6
+#define LIBAVUTIL_VERSION_MINOR 7
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \