Merge commit '605b047bcc48482dc8a356f56629da259fbddbf1'

[ffmpeg] / libavutil / avstring.c

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 2f00374176df388d5a4860cc661048bba4665d6b..e2422c0a5935a8d8163e12022f178234c4f8aaf0 100644 (file)
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -69,11 +69,11 @@ char *av_strnstr(const char *haystack, const char *needle, size_t hay_length)
 {
     size_t needle_len = strlen(needle);
     if (!needle_len)
-        return haystack;
+        return (char*)haystack;
     while (hay_length >= needle_len) {
         hay_length--;
         if (!memcmp(haystack, needle, needle_len))
-            return haystack;
+            return (char*)haystack;
         haystack++;
     }
     return NULL;