summaryrefslogtreecommitdiff
path: root/libavfilter/af_asyncts.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-27 07:49:45 +0100
committerAnton Khirnov <anton@khirnov.net>2012-11-28 08:50:19 +0100
commit565e4993c63f797e2d50ad2f1e8f62fdbe299666 (patch)
treebae5282b2ee875de4b01467f3cfaab54b0ab6ec0 /libavfilter/af_asyncts.c
parentbb6c67bb36b136de10256f0999128df4a42f9ffc (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_asyncts.c')
-rw-r--r--libavfilter/af_asyncts.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 94c5452d12..5d009f020b 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -39,7 +39,7 @@ typedef struct ASyncContext {
float min_delta_sec;
int max_comp;
- /* set by filter_samples() to signal an output frame to request_frame() */
+ /* set by filter_frame() to signal an output frame to request_frame() */
int got_output;
} ASyncContext;
@@ -141,7 +141,7 @@ static int request_frame(AVFilterLink *link)
}
buf->pts = s->pts;
- return ff_filter_samples(link, buf);
+ return ff_filter_frame(link, buf);
}
return ret;
@@ -161,7 +161,7 @@ static int64_t get_delay(ASyncContext *s)
return avresample_available(s->avr) + avresample_get_delay(s->avr);
}
-static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
{
AVFilterContext *ctx = inlink->dst;
ASyncContext *s = ctx->priv;
@@ -217,7 +217,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
av_samples_set_silence(buf_out->extended_data, out_size - delta,
delta, nb_channels, buf->format);
}
- ret = ff_filter_samples(outlink, buf_out);
+ ret = ff_filter_frame(outlink, buf_out);
if (ret < 0)
goto fail;
s->got_output = 1;
@@ -243,7 +243,7 @@ static const AVFilterPad avfilter_af_asyncts_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
- .filter_samples = filter_samples
+ .filter_frame = filter_frame,
},
{ NULL }
};