[SCM] libav/experimental: 10l: fix av_str[i]start()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:03:26 UTC 2013


The following commit has been merged in the experimental branch:
commit 059eeabf35f866415d91ff2b5829d8ab2e7f43f9
Author: Måns Rullgård <mans at mansr.com>
Date:   Tue Jul 10 21:43:35 2007 +0000

    10l: fix av_str[i]start()
    
    Originally committed as revision 9585 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/string.c b/libavutil/string.c
index 20f89c7..2f4de8e 100644
--- a/libavutil/string.c
+++ b/libavutil/string.c
@@ -25,7 +25,10 @@
 
 int av_strstart(const char *str, const char *pfx, const char **ptr)
 {
-    while (*pfx && *pfx++ == *str++);
+    while (*pfx && *pfx == *str) {
+        pfx++;
+        str++;
+    }
     if (!*pfx && ptr)
         *ptr = str;
     return !*pfx;
@@ -33,7 +36,10 @@ int av_strstart(const char *str, const char *pfx, const char **ptr)
 
 int av_stristart(const char *str, const char *pfx, const char **ptr)
 {
-    while (*pfx && toupper((unsigned)*pfx++) == toupper((unsigned)*str++));
+    while (*pfx && toupper((unsigned)*pfx) == toupper((unsigned)*str)) {
+        pfx++;
+        str++;
+    }
     if (!*pfx && ptr)
         *ptr = str;
     return !*pfx;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list