[FFmpeg-cvslog] avfilter/af_compand_fork: avoid strtok_r() so as not to break build
Michael Niedermayer
git at videolan.org
Wed Feb 26 12:02:39 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 26 11:44:42 2014 +0100| [1df1a1fe6120dac1b0a07465a18e173158bd184f] | committer: Michael Niedermayer
avfilter/af_compand_fork: avoid strtok_r() so as not to break build
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1df1a1fe6120dac1b0a07465a18e173158bd184f
---
libavfilter/af_compand_fork.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavfilter/af_compand_fork.c b/libavfilter/af_compand_fork.c
index dceebff..ae366e6 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,
More information about the ffmpeg-cvslog
mailing list