From cd7febd33f20b42aac14cf9cb87efdf619b39b0a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 28 Nov 2012 13:53:48 +0100 Subject: lavfi: replace filter_samples by filter_frame Based on patch by Anton Khirnov Signed-off-by: Michael Niedermayer --- libavfilter/af_amix.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavfilter/af_amix.c') diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 37853ca..aeefff8 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -309,7 +309,7 @@ static int output_frame(AVFilterLink *outlink, int nb_samples) if (s->next_pts != AV_NOPTS_VALUE) s->next_pts += nb_samples; - return ff_filter_samples(outlink, out_buf); + return ff_filter_frame(outlink, out_buf); } /** @@ -450,7 +450,7 @@ static int request_frame(AVFilterLink *outlink) return output_frame(outlink, available_samples); } -static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) { AVFilterContext *ctx = inlink->dst; MixContext *s = ctx->priv; @@ -502,7 +502,7 @@ static int init(AVFilterContext *ctx, const char *args) snprintf(name, sizeof(name), "input%d", i); pad.type = AVMEDIA_TYPE_AUDIO; pad.name = av_strdup(name); - pad.filter_samples = filter_samples; + pad.filter_frame = filter_frame; ff_insert_inpad(ctx, i, &pad); } -- cgit v1.1