summaryrefslogtreecommitdiff
path: root/libavutil/opt.h
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-11-10 13:03:09 +0100
committerNicolas George <nicolas.george@normalesup.org>2012-11-16 10:36:45 +0100
commit926481078b4f930ac9bb9ca2b4ab660cc9190935 (patch)
tree3e8572aa79c486e7ee9befbbcf8f8569c5846ccf /libavutil/opt.h
parent468781f8287b7bca8c560915a6f1ec6f37cfd4bd (diff)
downloadffmpeg-926481078b4f930ac9bb9ca2b4ab660cc9190935.tar.gz
lavu/opt: fix av_opt_get_key_value() API.
Do not skip the end delimiter. Reserve positive return values. This is an API break, but the function was introduced less than two weeks ago.
Diffstat (limited to 'libavutil/opt.h')
-rw-r--r--libavutil/opt.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 4a3b7f513a..1a8a4a2216 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -459,7 +459,8 @@ int av_opt_set_dict(void *obj, struct AVDictionary **options);
* Extract a key-value pair from the beginning of a string.
*
* @param ropts pointer to the options string, will be updated to
- * point to the rest of the string
+ * point to the rest of the string (one of the pairs_sep
+ * or the final NUL)
* @param key_val_sep a 0-terminated list of characters used to separate
* key from value, for example '='
* @param pairs_sep a 0-terminated list of characters used to separate
@@ -468,8 +469,8 @@ int av_opt_set_dict(void *obj, struct AVDictionary **options);
* @param rkey parsed key; must be freed using av_free()
* @param rval parsed value; must be freed using av_free()
*
- * @return 0 for success, or a negative value corresponding to an AVERROR
- * code in case of error; in particular:
+ * @return >=0 for success, or a negative value corresponding to an
+ * AVERROR code in case of error; in particular:
* AVERROR(EINVAL) if no key is present
*
*/