doc/example/muxing: fix video timestamps

[ffmpeg] / libavfilter / asrc_abuffer.c

diff --git a/libavfilter/asrc_abuffer.c b/libavfilter/asrc_abuffer.c
index cfa5f674866d6b416ae461914c727687e5ec4d20..ad71e12c5bea77db8604d1164eaf54317d60f7c0 100644 (file)
--- 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"
@@ -125,9 +126,9 @@ static inline void log_input_change(void *ctx, AVFilterLink *link, AVFilterBuffe
                                  -1, ref->audio->channel_layout);
     av_log(ctx, AV_LOG_INFO,
            "Audio input format changed: "
-           "%s:%s:%"PRId64" -> %s:%s:%u, normalizing\n",
+           "%s:%s:%d -> %s:%s:%d, normalizing\n",
            av_get_sample_fmt_name(link->format),
-           old_layout_str, link->sample_rate,
+           old_layout_str, (int)link->sample_rate,
            av_get_sample_fmt_name(ref->format),
            new_layout_str, ref->audio->sample_rate);
 }
@@ -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,