diff options
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/avstring.c | 22 | ||||
-rw-r--r-- | libavutil/avstring.h | 21 | ||||
-rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 27 insertions, 18 deletions
diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 45f8d78172..788667e9d6 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -285,6 +285,28 @@ int av_escape(char **dst, const char *src, const char *special_chars, } } +int av_isdigit(int c) +{ + return c >= '0' && c <= '9'; +} + +int av_isgraph(int c) +{ + return c > 32 && c < 127; +} + +int av_isspace(int c) +{ + return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || + c == '\v'; +} + +int av_isxdigit(int c) +{ + c = av_tolower(c); + return av_isdigit(c) || (c >= 'a' && c <= 'z'); +} + #ifdef TEST int main(void) diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 5b078f15ae..438ef799eb 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -188,26 +188,17 @@ char *av_strtok(char *s, const char *delim, char **saveptr); /** * Locale-independent conversion of ASCII isdigit. */ -static inline int av_isdigit(int c) -{ - return c >= '0' && c <= '9'; -} +int av_isdigit(int c); /** * Locale-independent conversion of ASCII isgraph. */ -static inline int av_isgraph(int c) -{ - return c > 32 && c < 127; -} +int av_isgraph(int c); /** * Locale-independent conversion of ASCII isspace. */ -static inline int av_isspace(int c) -{ - return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; -} +int av_isspace(int c); /** * Locale-independent conversion of ASCII characters to uppercase. @@ -232,11 +223,7 @@ static inline int av_tolower(int c) /** * Locale-independent conversion of ASCII isxdigit. */ -static inline int av_isxdigit(int c) -{ - c = av_tolower(c); - return av_isdigit(c) || (c >= 'a' && c <= 'z'); -} +int av_isxdigit(int c); /** * Locale-independent case-insensitive compare. diff --git a/libavutil/version.h b/libavutil/version.h index 4cd82268db..ee33390157 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 18 +#define LIBAVUTIL_VERSION_MINOR 19 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |