diff options
Diffstat (limited to 'libavfilter/af_amerge.c')
| -rw-r--r-- | libavfilter/af_amerge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index a8942a18f0..43d2a75890 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -119,8 +119,8 @@ static int query_formats(AVFilterContext *ctx) if ((inlayout[i] >> c) & 1) *(route[i]++) = out_ch_number++; } - formats = avfilter_make_format_list(ff_packed_sample_fmts_array); - avfilter_set_common_sample_formats(ctx, formats); + formats = ff_make_format_list(ff_packed_sample_fmts_array); + ff_set_common_formats(ctx, formats); for (i = 0; i < am->nb_inputs; i++) { layouts = NULL; ff_add_channel_layout(&layouts, inlayout[i]); @@ -315,7 +315,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }; snprintf(name, sizeof(name), "in%d", i); - avfilter_insert_inpad(ctx, i, &pad); + ff_insert_inpad(ctx, i, &pad); } return 0; } |