Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'

* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
	avprobe.c
	doc/APIchanges
	libavcodec/dvdsubdec.c
	libavcodec/utils.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/eval.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 4 insertions, 17 deletions

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.