aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-21 15:42:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-22 22:25:15 +0100
commit911676c64374af3959ef01609047503a42d5bf87 (patch)
treeb49ca669971c8b01518813bae8759631072e59d8
parent1c63aed232febf4404659bf006237ee4f7f17c9c (diff)
downloadffmpeg-911676c64374af3959ef01609047503a42d5bf87.tar.gz
avutil/avstring: add av_strnlen()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/APIchanges4
-rw-r--r--libavutil/avstring.h14
-rw-r--r--libavutil/version.h4
3 files changed, 20 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 7139f7a266..21a8c4c0c4 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,10 @@ libavutil: 2012-10-22
API changes, most recent first:
+
+2013-12-22 - xxxxxxx - lavu 52.59.100 - avstring.h
+ Add av_strnlen() function.
+
2013-12-xx - xxxxxxx - lavu 52.57.100 - opencl.h
Add av_opencl_benchmark() function.
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index 882a2b57dc..de2f71d12b 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -132,6 +132,20 @@ size_t av_strlcat(char *dst, const char *src, size_t size);
size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
/**
+ * Get the count of continuous non zero chars starting from the beginning.
+ *
+ * @param len maximum number of characters to check in the string, that
+ * is the maximum value which is returned by the function
+ */
+static inline size_t av_strnlen(const char *s, size_t len)
+{
+ size_t i;
+ for (i = 0; i < len && s[i]; i++)
+ ;
+ return i;
+}
+
+/**
* Print arguments following specified format into a large enough auto
* allocated buffer. It is similar to GNU asprintf().
* @param fmt printf-compatible format string, specifying how the
diff --git a/libavutil/version.h b/libavutil/version.h
index e7bad6f9a8..a70a110662 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -75,8 +75,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 58
-#define LIBAVUTIL_VERSION_MICRO 101
+#define LIBAVUTIL_VERSION_MINOR 59
+#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \