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_amerge.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_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 fa4f9f108e..61770b4340 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -217,7 +217,7 @@ static inline void copy_samples(int nb_inputs, struct amerge_input in[], } } -static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *insamples) { AVFilterContext *ctx = inlink->dst; AMergeContext *am = ctx->priv; @@ -290,7 +290,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) } } } - return ff_filter_samples(ctx->outputs[0], outbuf); + return ff_filter_frame(ctx->outputs[0], outbuf); } static av_cold int init(AVFilterContext *ctx, const char *args) @@ -313,7 +313,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args) AVFilterPad pad = { .name = name, .type = AVMEDIA_TYPE_AUDIO, - .filter_samples = filter_samples, + .filter_frame = filter_frame, .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }; if (!name) |