From e4b1fcd474767e49d78cca877dd8ff1bb4af1f5d Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Sun, 30 Sep 2012 10:23:08 +0200
Subject: [PATCH] lavu/opt: cosmetic fixes forgotten in the previous patch.
---
libavutil/opt.c | 13 ++++++++-----
libavutil/opt.h | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index d826b4bcd3c..a10135b9c87 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -800,11 +800,14 @@ static int is_key_char(char c)
}
/**
- * Read a key from a string. The key consists of is_key_char characters and
- * must be terminated by a character from the delim string; spaces are
- * ignored. The key buffer must be 4 bytes larger than the longest
- * acceptable key. If the key is too long, an ellipsis will be written at
- * the end. @return 0 for success (even with ellipsis), <0 for failure
+ * Read a key from a string.
+ *
+ * The key consists of is_key_char characters and must be terminated by a
+ * character from the delim string; spaces are ignored. The key buffer must
+ * be 4 bytes larger than the longest acceptable key. If the key is too
+ * long, an ellipsis will be written at the end.
+ *
+ * @return 0 for success (even with ellipsis), <0 for failure
*/
static int get_key(const char **ropts, const char *delim, char *key, unsigned key_size)
{
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 3aa912a2353..81fefd9b166 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -394,7 +394,7 @@ int av_set_options_string(void *ctx, const char *opts,
const char *key_val_sep, const char *pairs_sep);
/**
- * Parse the key=value pairs list in opts. For each key=value pair found,
+ * Parse the key-value pairs list in opts. For each key=value pair found,
* set the value of the corresponding option in ctx.
*
* @param ctx the AVClass object to set options on
@@ -417,7 +417,7 @@ int av_set_options_string(void *ctx, const char *opts,
* cannot be set
*
* Options names must use only the following characters: a-z A-Z 0-9 - . / _
- * Separators must use characters distinct from from options and from each
+ * Separators must use characters distinct from option names and from each
* other.
*/
int av_opt_set_from_string(void *ctx, const char *opts,
--
GitLab