OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d2e0a27
)
avstring: fix "warning: return discards const qualifier from pointer target type"
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 30 Jan 2013 15:54:15 +0000
(16:54 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 30 Jan 2013 15:54:15 +0000
(16:54 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/avstring.c
patch
|
blob
|
history
diff --git
a/libavutil/avstring.c
b/libavutil/avstring.c
index
2f00374
..
e2422c0
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;