X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fasrc_abuffer.c;h=ad71e12c5bea77db8604d1164eaf54317d60f7c0;hb=175cc378b3bd970caf1641e5df3361d6233747e1;hp=4a0f08e538d95fd81b5b2b8075c409b3380ad163;hpb=487e088e5e7f4cade6bce5e9a3cff28fce303af1;p=ffmpeg

diff --git a/libavfilter/asrc_abuffer.c b/libavfilter/asrc_abuffer.c
index 4a0f08e538d..ad71e12c5be 100644
--- a/libavfilter/asrc_abuffer.c
+++ b/libavfilter/asrc_abuffer.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/audioconvert.h"
+#include "libavutil/avstring.h"
 #include "libavutil/fifo.h"
 #include "asrc_abuffer.h"
 #include "internal.h"
@@ -240,7 +241,7 @@ int av_asrc_buffer_add_buffer(AVFilterContext *ctx,
 
     av_samples_fill_arrays(data, linesize,
                            buf, nb_channels, nb_samples,
-                           sample_fmt, planar, 16);
+                           sample_fmt, 16);
 
     return av_asrc_buffer_add_samples(ctx,
                                       data, linesize, nb_samples,
@@ -256,7 +257,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args0, void *opaque)
     char *args = av_strdup(args0);
     int ret;
 
-    arg = strtok_r(args, ":", &ptr);
+    arg = av_strtok(args, ":", &ptr);
 
 #define ADD_FORMAT(fmt_name)                                            \
     if (!arg)                                                           \
@@ -266,7 +267,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args0, void *opaque)
         return ret;                                                     \
     }                                                                   \
     if (*args)                                                          \
-        arg = strtok_r(NULL, ":", &ptr)
+        arg = av_strtok(NULL, ":", &ptr)
 
     ADD_FORMAT(sample_rate);
     ADD_FORMAT(sample_format);
@@ -361,8 +362,8 @@ AVFilter avfilter_asrc_abuffer = {
     .init        = init,
     .uninit      = uninit,
 
-    .inputs      = (AVFilterPad[]) {{ .name = NULL }},
-    .outputs     = (AVFilterPad[]) {{ .name            = "default",
+    .inputs      = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs     = (const AVFilterPad[]) {{ .name      = "default",
                                       .type            = AVMEDIA_TYPE_AUDIO,
                                       .request_frame   = request_frame,
                                       .poll_frame      = poll_frame,