Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / avstring.c

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index d167d5245eaf4d15ee2039770110ca7f4b5e6aac..76f6bb2c9b58d47f3dfaa64c79f8992abfdc2759 100644 (file)
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -189,16 +189,12 @@ char *av_strtok(char *s, const char *delim, char **saveptr)
     return tok;
 }
 
-#define TOUPPER(c) do { if (c >= 'a' && c <= 'z') c -= 'a' - 'A'; } while (0)
-
 int av_strcasecmp(const char *a, const char *b)
 {
     uint8_t c1, c2;
     do {
-        c1 = *a++;
-        c2 = *b++;
-        TOUPPER(c1);
-        TOUPPER(c2);
+        c1 = av_tolower(*a++);
+        c2 = av_tolower(*b++);
     } while (c1 && c1 == c2);
     return c1 - c2;
 }
@@ -208,10 +204,8 @@ int av_strncasecmp(const char *a, const char *b, size_t n)
     const char *end = a + n;
     uint8_t c1, c2;
     do {
-        c1 = *a++;
-        c2 = *b++;
-        TOUPPER(c1);
-        TOUPPER(c2);
+        c1 = av_tolower(*a++);
+        c2 = av_tolower(*b++);
     } while (a < end && c1 && c1 == c2);
     return c1 - c2;
 }