aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_yadif.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_yadif.c
parentfa417fcd278a003530fe6bf851f8194177a5e71f (diff)
downloadffmpeg-803391f7195ba37a553026009ff989d6e2625d8f.tar.gz
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_yadif.c')
-rw-r--r--libavfilter/vf_yadif.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 694b984764..b498ab9d39 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -24,6 +24,7 @@
#include "libavutil/pixdesc.h"
#include "avfilter.h"
#include "formats.h"
+#include "internal.h"
#include "video.h"
#include "yadif.h"
@@ -229,10 +230,10 @@ static void return_frame(AVFilterContext *ctx, int is_second)
} else {
yadif->out->pts = AV_NOPTS_VALUE;
}
- avfilter_start_frame(ctx->outputs[0], yadif->out);
+ ff_start_frame(ctx->outputs[0], yadif->out);
}
- avfilter_draw_slice(ctx->outputs[0], 0, link->h, 1);
- avfilter_end_frame(ctx->outputs[0]);
+ ff_draw_slice(ctx->outputs[0], 0, link->h, 1);
+ ff_end_frame(ctx->outputs[0]);
yadif->frame_pending = (yadif->mode&1) && !is_second;
}
@@ -260,7 +261,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
yadif->prev = NULL;
if (yadif->out->pts != AV_NOPTS_VALUE)
yadif->out->pts *= 2;
- avfilter_start_frame(ctx->outputs[0], yadif->out);
+ ff_start_frame(ctx->outputs[0], yadif->out);
return;
}
@@ -274,7 +275,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
yadif->out->video->interlaced = 0;
if (yadif->out->pts != AV_NOPTS_VALUE)
yadif->out->pts *= 2;
- avfilter_start_frame(ctx->outputs[0], yadif->out);
+ ff_start_frame(ctx->outputs[0], yadif->out);
}
static void end_frame(AVFilterLink *link)
@@ -286,8 +287,8 @@ static void end_frame(AVFilterLink *link)
return;
if (yadif->auto_enable && !yadif->cur->video->interlaced) {
- avfilter_draw_slice(ctx->outputs[0], 0, link->h, 1);
- avfilter_end_frame(ctx->outputs[0]);
+ ff_draw_slice(ctx->outputs[0], 0, link->h, 1);
+ ff_end_frame(ctx->outputs[0]);
return;
}
@@ -310,7 +311,7 @@ static int request_frame(AVFilterLink *link)
if (yadif->eof)
return AVERROR_EOF;
- ret = avfilter_request_frame(link->src->inputs[0]);
+ ret = ff_request_frame(link->src->inputs[0]);
if (ret == AVERROR_EOF && yadif->next) {
AVFilterBufferRef *next = avfilter_ref_buffer(yadif->next, AV_PERM_READ);
@@ -335,14 +336,14 @@ static int poll_frame(AVFilterLink *link)
if (yadif->frame_pending)
return 1;
- val = avfilter_poll_frame(link->src->inputs[0]);
+ val = ff_poll_frame(link->src->inputs[0]);
if (val <= 0)
return val;
if (val==1 && !yadif->next) { //FIXME change API to not requre this red tape
- if ((ret = avfilter_request_frame(link->src->inputs[0])) < 0)
+ if ((ret = ff_request_frame(link->src->inputs[0])) < 0)
return ret;
- val = avfilter_poll_frame(link->src->inputs[0]);
+ val = ff_poll_frame(link->src->inputs[0]);
if (val <= 0)
return val;
}