summaryrefslogtreecommitdiff
path: root/libavfilter/af_ashowinfo.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_ashowinfo.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_ashowinfo.c')
-rw-r--r--libavfilter/af_ashowinfo.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index bcf821ac65..c8e830eee7 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -34,6 +34,7 @@
#include "audio.h"
#include "avfilter.h"
+#include "internal.h"
typedef struct AShowInfoContext {
/**
@@ -64,7 +65,7 @@ static void uninit(AVFilterContext *ctx)
av_freep(&s->plane_checksums);
}
-static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
{
AVFilterContext *ctx = inlink->dst;
AShowInfoContext *s = ctx->priv;
@@ -103,7 +104,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
av_log(ctx, AV_LOG_INFO, "]\n");
s->frame++;
- return ff_filter_samples(inlink->dst->outputs[0], buf);
+ return ff_filter_frame(inlink->dst->outputs[0], buf);
}
static const AVFilterPad inputs[] = {
@@ -112,7 +113,7 @@ static const AVFilterPad inputs[] = {
.type = AVMEDIA_TYPE_AUDIO,
.get_audio_buffer = ff_null_get_audio_buffer,
.config_props = config_input,
- .filter_samples = filter_samples,
+ .filter_frame = filter_frame,
.min_perms = AV_PERM_READ,
},
{ NULL },