diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-27 07:49:45 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-11-28 08:50:19 +0100 |
| commit | 565e4993c63f797e2d50ad2f1e8f62fdbe299666 (patch) | |
| tree | bae5282b2ee875de4b01467f3cfaab54b0ab6ec0 /libavfilter/af_amix.c | |
| parent | bb6c67bb36b136de10256f0999128df4a42f9ffc (diff) | |
lavfi: merge start_frame/draw_slice/end_frame
Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.
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 7ef94b9e97..c2fb158031 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -314,7 +314,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); } /** @@ -455,7 +455,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; @@ -509,7 +509,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); } |