[SCM] libav/experimental: ignore whitespace in ff_eval

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:52:43 UTC 2013


The following commit has been merged in the experimental branch:
commit 8cd68d805611c319ac0518769883ee2c9c75d211
Author: Oded Shimon <ods15 at ods15.dyndns.org>
Date:   Sat Oct 28 09:49:13 2006 +0000

    ignore whitespace in ff_eval
    
    Originally committed as revision 6821 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index 9a86054..4b5fdbd 100644
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -382,9 +382,14 @@ AVEvalExpr * ff_parse(char *s, const char **const_name,
                char **error){
     Parser p;
     AVEvalExpr * e;
+    char w[strlen(s) + 1], * wp = w;
+
+    while (*s)
+        if (!isspace(*s++)) *wp++ = s[-1];
+    *wp++ = 0;
 
     p.stack_index=100;
-    p.s= s;
+    p.s= w;
     p.const_name = const_name;
     p.func1      = func1;
     p.func1_name = func1_name;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list