ffmpeg: 10l add back show_banner() that was lost in the last merge.

[ffmpeg] / libavfilter / af_aformat.c

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 0eb7dfa4e22353d6e7940b573bdd110f70382886..e8926355e2de97a29bce4e4b63cc378d1f05ed12 100644 (file)
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -50,7 +50,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
         aformat->fmts_list = all_formats;                               \
     } else {                                                            \
         for (fmt_str = fmts_str;                                        \
-             fmt_str = strtok_r(fmt_str, ",", &ptr); fmt_str = NULL) {  \
+             fmt_str = av_strtok(fmt_str, ",", &ptr); fmt_str = NULL) { \
             if ((ret = ff_parse_##fmt_name((fmt_type *)&fmt,            \
                                            fmt_str, ctx)) < 0) {        \
                 av_freep(&fmts_str);                                    \
@@ -63,9 +63,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
     if (*args)                                                          \
         args++;
 
-    ADD_FORMATS(avfilter_all_formats(AVMEDIA_TYPE_AUDIO), sample_format, int, formats);
-    ADD_FORMATS(avfilter_all_channel_layouts(), channel_layout, int64_t, chlayouts);
-    ADD_FORMATS(avfilter_all_packing_formats(), packing_format, int, packing);
+    ADD_FORMATS(avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO), sample_format, int, formats);
+    ADD_FORMATS(avfilter_make_all_channel_layouts(), channel_layout, int64_t, chlayouts);
+    ADD_FORMATS(avfilter_make_all_packing_formats(), packing_format, int, packing);
 
     return 0;
 
@@ -98,11 +98,11 @@ AVFilter avfilter_af_aformat = {
     .query_formats = query_formats,
     .priv_size     = sizeof(AFormatContext),
 
-    .inputs        = (AVFilterPad[]) {{ .name            = "default",
+    .inputs        = (const AVFilterPad[]) {{ .name      = "default",
                                         .type            = AVMEDIA_TYPE_AUDIO,
                                         .filter_samples  = filter_samples},
                                       { .name = NULL}},
-    .outputs       = (AVFilterPad[]) {{ .name            = "default",
+    .outputs       = (const AVFilterPad[]) {{ .name      = "default",
                                         .type            = AVMEDIA_TYPE_AUDIO},
                                       { .name = NULL}},
 };