diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
|---|---|---|
| committer | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
| commit | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (patch) | |
| tree | fcf92b1c0f1772b379828125c2555a47d1c81c6b /libavutil/avstring.c | |
| parent | 47e88486b4b3b3de992b07f89dfaedf410a8bd5e (diff) | |
| parent | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (diff) | |
| download | ffmpeg-c540312ac3b58e0bbd751844fc2c47c6e3713cf5.tar.gz | |
Merge remote-tracking branch 'origin/master' into combined
Diffstat (limited to 'libavutil/avstring.c')
| -rw-r--r-- | libavutil/avstring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 2f00374176..e2422c0a59 100644 --- 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; |