summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-05-30 11:20:32 +0200
committerAnton Khirnov <anton@khirnov.net>2012-06-05 09:38:16 +0200
commit803391f7195ba37a553026009ff989d6e2625d8f (patch)
tree4516f7e9e0ca7a4a15b7e610efecc4381de7814e /libavfilter/vf_overlay.c
parentfa417fcd278a003530fe6bf851f8194177a5e71f (diff)
lavfi: remove request/poll and drawing functions from public API on next bump
They are only useful inside filters and we don't allow user filters for now.
Diffstat (limited to 'libavfilter/vf_overlay.c')
-rw-r--r--libavfilter/vf_overlay.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 571d48dfad..55f1cc3a14 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -33,6 +33,7 @@
#include "libavutil/imgutils.h"
#include "libavutil/mathematics.h"
#include "internal.h"
+#include "video.h"
static const char *const var_names[] = {
"E",
@@ -220,7 +221,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
if (!over->overpicref || over->overpicref->pts < outpicref->pts) {
AVFilterBufferRef *old = over->overpicref;
over->overpicref = NULL;
- avfilter_request_frame(ctx->inputs[OVERLAY]);
+ ff_request_frame(ctx->inputs[OVERLAY]);
if (over->overpicref) {
if (old)
avfilter_unref_buffer(old);
@@ -228,7 +229,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
over->overpicref = old;
}
- avfilter_start_frame(inlink->dst->outputs[0], outpicref);
+ ff_start_frame(inlink->dst->outputs[0], outpicref);
}
static void start_frame_overlay(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
@@ -333,12 +334,12 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
over->overpicref->video->w, over->overpicref->video->h,
y, outpicref->video->w, h);
}
- avfilter_draw_slice(outlink, y, h, slice_dir);
+ ff_draw_slice(outlink, y, h, slice_dir);
}
static void end_frame(AVFilterLink *inlink)
{
- avfilter_end_frame(inlink->dst->outputs[0]);
+ ff_end_frame(inlink->dst->outputs[0]);
avfilter_unref_buffer(inlink->cur_buf);
}
@@ -350,12 +351,12 @@ static int poll_frame(AVFilterLink *link)
{
AVFilterContext *s = link->src;
OverlayContext *over = s->priv;
- int ret = avfilter_poll_frame(s->inputs[OVERLAY]);
+ int ret = ff_poll_frame(s->inputs[OVERLAY]);
if (ret == AVERROR_EOF)
ret = !!over->overpicref;
- return ret && avfilter_poll_frame(s->inputs[MAIN]);
+ return ret && ff_poll_frame(s->inputs[MAIN]);
}
AVFilter avfilter_vf_overlay = {