Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavutil / avstring.h

diff --git a/ffmpeg/libavutil/avstring.h b/ffmpeg/libavutil/avstring.h
index 616c0662fc433bdc149098125bbc95a08b70442c..ffb7aa6bfab9e1f5efa8411354d4f92ca826c2a9 100644 (file)
--- a/ffmpeg/libavutil/avstring.h
+++ b/ffmpeg/libavutil/avstring.h
@@ -203,22 +203,22 @@ char *av_strtok(char *s, const char *delim, char **saveptr);
 /**
  * Locale-independent conversion of ASCII isdigit.
  */
-int av_isdigit(int c);
+av_const int av_isdigit(int c);
 
 /**
  * Locale-independent conversion of ASCII isgraph.
  */
-int av_isgraph(int c);
+av_const int av_isgraph(int c);
 
 /**
  * Locale-independent conversion of ASCII isspace.
  */
-int av_isspace(int c);
+av_const int av_isspace(int c);
 
 /**
  * Locale-independent conversion of ASCII characters to uppercase.
  */
-static inline int av_toupper(int c)
+static inline av_const int av_toupper(int c)
 {
     if (c >= 'a' && c <= 'z')
         c ^= 0x20;
@@ -228,7 +228,7 @@ static inline int av_toupper(int c)
 /**
  * Locale-independent conversion of ASCII characters to lowercase.
  */
-static inline int av_tolower(int c)
+static inline av_const int av_tolower(int c)
 {
     if (c >= 'A' && c <= 'Z')
         c ^= 0x20;
@@ -238,7 +238,7 @@ static inline int av_tolower(int c)
 /**
  * Locale-independent conversion of ASCII isxdigit.
  */
-int av_isxdigit(int c);
+av_const int av_isxdigit(int c);
 
 /**
  * Locale-independent case-insensitive compare.
@@ -357,6 +357,13 @@ int av_escape(char **dst, const char *src, const char *special_chars,
 int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
                    unsigned int flags);
 
+/**
+ * Check if a name is in a list.
+ * @returns 0 if not found, or the 1 based index where it has been found in the
+ *            list.
+ */
+int av_match_list(const char *name, const char *list, char separator);
+
 /**
  * @}
  */