diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 12:04:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 12:04:00 +0100 |
| commit | 8b804859604df7b4e06ea77985c9051d227dfa62 (patch) | |
| tree | 71c472a17f60a36c89ab2f1bd344a0fe49258f6a | |
| parent | 1df1a1fe6120dac1b0a07465a18e173158bd184f (diff) | |
| download | ffmpeg-8b804859604df7b4e06ea77985c9051d227dfa62.tar.gz | |
avfilter/af_compand: also support '|' as seperator
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_compand.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, |