From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 26 Feb 2014 11:04:00 +0000 (+0100)
Subject: avfilter/af_compand: also support '|' as seperator
X-Git-Tag: android-x86-6.0-r1~6991
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b804859604df7b4e06ea77985c9051d227dfa62;p=android-x86%2Fexternal-ffmpeg.git

avfilter/af_compand: also support '|' as seperator

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

diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index e610021274..a02e586092 100644
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -134,7 +134,7 @@ static void count_items(char *item_str, int *nb_items)
 
     *nb_items = 1;
     for (p = item_str; *p; p++) {
-        if (*p == ' ')
+        if (*p == ' ' || *p == '|')
             (*nb_items)++;
     }
 }
@@ -329,7 +329,7 @@ static int config_output(AVFilterLink *outlink)
 
     p = s->attacks;
     for (i = 0, new_nb_items = 0; i < nb_attacks; i++) {
-        char *tstr = av_strtok(p, " ", &saveptr);
+        char *tstr = av_strtok(p, " |", &saveptr);
         p = NULL;
         new_nb_items += sscanf(tstr, "%lf", &s->channels[i].attack) == 1;
         if (s->channels[i].attack < 0)
@@ -339,7 +339,7 @@ static int config_output(AVFilterLink *outlink)
 
     p = s->decays;
     for (i = 0, new_nb_items = 0; i < nb_decays; i++) {
-        char *tstr = av_strtok(p, " ", &saveptr);
+        char *tstr = av_strtok(p, " |", &saveptr);
         p = NULL;
         new_nb_items += sscanf(tstr, "%lf", &s->channels[i].decay) == 1;
         if (s->channels[i].decay < 0)
@@ -357,7 +357,7 @@ static int config_output(AVFilterLink *outlink)
 #define S(x) s->segments[2 * ((x) + 1)]
     p = s->points;
     for (i = 0, new_nb_items = 0; i < nb_points; i++) {
-        char *tstr = av_strtok(p, " ", &saveptr);
+        char *tstr = av_strtok(p, " |", &saveptr);
         p = NULL;
         if (sscanf(tstr, "%lf/%lf", &S(i).x, &S(i).y) != 2) {
             av_log(ctx, AV_LOG_ERROR,