Merge remote-tracking branch 'luzero/pulse'

[ffmpeg] / libavfilter / af_aconvert.c

diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
index d794c23576c169e4618d9073aacd231d420da30b..fef096cb8e8bffe179fa6c0457df76e13fd58b25 100644 (file)
--- a/libavfilter/af_aconvert.c
+++ b/libavfilter/af_aconvert.c
@@ -28,6 +28,7 @@
  */
 
 #include "libavutil/audioconvert.h"
+#include "libavutil/avstring.h"
 #include "libavcodec/audioconvert.h"
 #include "avfilter.h"
 #include "internal.h"
@@ -125,15 +126,15 @@ static av_cold int init(AVFilterContext *ctx, const char *args0, void *opaque)
     aconvert->out_chlayout    = 0;
     aconvert->out_packing_fmt = -1;
 
-    if ((arg = strtok_r(args, ":", &ptr)) && strcmp(arg, "auto")) {
+    if ((arg = av_strtok(args, ":", &ptr)) && strcmp(arg, "auto")) {
         if ((ret = ff_parse_sample_format(&aconvert->out_sample_fmt, arg, ctx)) < 0)
             goto end;
     }
-    if ((arg = strtok_r(NULL, ":", &ptr)) && strcmp(arg, "auto")) {
+    if ((arg = av_strtok(NULL, ":", &ptr)) && strcmp(arg, "auto")) {
         if ((ret = ff_parse_channel_layout(&aconvert->out_chlayout, arg, ctx)) < 0)
             goto end;
     }
-    if ((arg = strtok_r(NULL, ":", &ptr)) && strcmp(arg, "auto")) {
+    if ((arg = av_strtok(NULL, ":", &ptr)) && strcmp(arg, "auto")) {
         if ((ret = ff_parse_packing_format((int *)&aconvert->out_packing_fmt, arg, ctx)) < 0)
             goto end;
     }