[FFmpeg-cvslog] avstring: fix return discards qualifiers from pointer target type.

Michael Niedermayer git at videolan.org
Mon Oct 17 23:13:23 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 17 22:55:00 2011 +0200| [68eb35b886af4134bf746312b53d0d83be414286] | committer: Michael Niedermayer

avstring: fix return discards qualifiers from pointer target type.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68eb35b886af4134bf746312b53d0d83be414286
---

 libavutil/avstring.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 4cebbe0..4c50448 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -51,11 +51,11 @@ int av_stristart(const char *str, const char *pfx, const char **ptr)
 char *av_stristr(const char *s1, const char *s2)
 {
     if (!*s2)
-        return s1;
+        return (char*)(intptr_t)s1;
 
     do {
         if (av_stristart(s1, s2, NULL))
-            return s1;
+            return (char*)(intptr_t)s1;
     } while (*s1++);
 
     return NULL;



More information about the ffmpeg-cvslog mailing list