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_amix.c | |
| parent | 16af29a7a6deff3f6081fca1e36ad96cf8fec77d (diff) | |
| download | ffmpeg-streaming-cd7febd33f20b42aac14cf9cb87efdf619b39b0a.zip ffmpeg-streaming-cd7febd33f20b42aac14cf9cb87efdf619b39b0a.tar.gz | |
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_amix.c')
| -rw-r--r-- | libavfilter/af_amix.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |
