diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:53:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 16:43:34 +0100 |
| commit | cd7febd33f20b42aac14cf9cb87efdf619b39b0a (patch) | |
| tree | 6826129a1f327836e1c980449b2fa7308307b615 /libavfilter/af_join.c | |
| parent | 16af29a7a6deff3f6081fca1e36ad96cf8fec77d (diff) | |
lavfi: replace filter_samples by filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
| -rw-r--r-- | libavfilter/af_join.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index ee8a4972c5..864663b616 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -94,7 +94,7 @@ static const AVClass join_class = { .version = LIBAVUTIL_VERSION_INT, }; -static int filter_samples(AVFilterLink *link, AVFilterBufferRef *buf) +static int filter_frame(AVFilterLink *link, AVFilterBufferRef *buf) { AVFilterContext *ctx = link->dst; JoinContext *s = ctx->priv; @@ -229,7 +229,7 @@ static int join_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; pad.needs_fifo = 1; @@ -470,7 +470,7 @@ static int join_request_frame(AVFilterLink *outlink) priv->nb_in_buffers = ctx->nb_inputs; buf->buf->priv = priv; - ret = ff_filter_samples(outlink, buf); + ret = ff_filter_frame(outlink, buf); memset(s->input_frames, 0, sizeof(*s->input_frames) * ctx->nb_inputs); |