diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:44:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:48:34 +0100 |
| commit | 1df1a1fe6120dac1b0a07465a18e173158bd184f (patch) | |
| tree | 3add387d41d6b2a6a3e218997bc6426fdd96cfbb /libavfilter | |
| parent | 22307f170ffc89b37b26a8ff93a30ee6d56effcf (diff) | |
| download | ffmpeg-1df1a1fe6120dac1b0a07465a18e173158bd184f.tar.gz | |
avfilter/af_compand_fork: avoid strtok_r() so as not to break build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_compand_fork.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavfilter/af_compand_fork.c b/libavfilter/af_compand_fork.c index dceebff2fe..ae366e6f41 100644 --- a/libavfilter/af_compand_fork.c +++ b/libavfilter/af_compand_fork.c @@ -27,8 +27,7 @@ * audio compand filter */ -#include <string.h> - +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/mathematics.h" @@ -368,7 +367,7 @@ static int config_output(AVFilterLink *outlink) p = s->attacks; for (i = 0, new_nb_items = 0; i < nb_attacks; i++) { - char *tstr = strtok_r(p, "|", &saveptr); + char *tstr = av_strtok(p, "|", &saveptr); p = NULL; new_nb_items += sscanf(tstr, "%f", &s->channels[i].attack) == 1; if (s->channels[i].attack < 0) { @@ -380,7 +379,7 @@ static int config_output(AVFilterLink *outlink) p = s->decays; for (i = 0, new_nb_items = 0; i < nb_decays; i++) { - char *tstr = strtok_r(p, "|", &saveptr); + char *tstr = av_strtok(p, "|", &saveptr); p = NULL; new_nb_items += sscanf(tstr, "%f", &s->channels[i].decay) == 1; if (s->channels[i].decay < 0) { @@ -401,7 +400,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 = strtok_r(p, "|", &saveptr); + char *tstr = av_strtok(p, "|", &saveptr); p = NULL; if (sscanf(tstr, "%f/%f", &S(i).x, &S(i).y) != 2) { av_log(ctx, AV_LOG_ERROR, |