summaryrefslogtreecommitdiff
path: root/libavfilter/vf_select.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_select.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_select.c')
-rw-r--r--libavfilter/vf_select.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index 2b6b49c153..dab47ced85 100644
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -27,6 +27,7 @@
#include "libavutil/fifo.h"
#include "libavutil/mathematics.h"
#include "avfilter.h"
+#include "internal.h"
#include "video.h"
static const char *const var_names[] = {
@@ -242,7 +243,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
sizeof(picref), NULL);
return;
}
- avfilter_start_frame(inlink->dst->outputs[0], avfilter_ref_buffer(picref, ~0));
+ ff_start_frame(inlink->dst->outputs[0], avfilter_ref_buffer(picref, ~0));
}
}
@@ -251,7 +252,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
SelectContext *select = inlink->dst->priv;
if (select->select && !select->cache_frames)
- avfilter_draw_slice(inlink->dst->outputs[0], y, h, slice_dir);
+ ff_draw_slice(inlink->dst->outputs[0], y, h, slice_dir);
}
static void end_frame(AVFilterLink *inlink)
@@ -262,7 +263,7 @@ static void end_frame(AVFilterLink *inlink)
if (select->select) {
if (select->cache_frames)
return;
- avfilter_end_frame(inlink->dst->outputs[0]);
+ ff_end_frame(inlink->dst->outputs[0]);
}
avfilter_unref_buffer(picref);
}
@@ -277,15 +278,15 @@ static int request_frame(AVFilterLink *outlink)
if (av_fifo_size(select->pending_frames)) {
AVFilterBufferRef *picref;
av_fifo_generic_read(select->pending_frames, &picref, sizeof(picref), NULL);
- avfilter_start_frame(outlink, avfilter_ref_buffer(picref, ~0));
- avfilter_draw_slice(outlink, 0, outlink->h, 1);
- avfilter_end_frame(outlink);
+ ff_start_frame(outlink, avfilter_ref_buffer(picref, ~0));
+ ff_draw_slice(outlink, 0, outlink->h, 1);
+ ff_end_frame(outlink);
avfilter_unref_buffer(picref);
return 0;
}
while (!select->select) {
- int ret = avfilter_request_frame(inlink);
+ int ret = ff_request_frame(inlink);
if (ret < 0)
return ret;
}
@@ -300,12 +301,12 @@ static int poll_frame(AVFilterLink *outlink)
int count, ret;
if (!av_fifo_size(select->pending_frames)) {
- if ((count = avfilter_poll_frame(inlink)) <= 0)
+ if ((count = ff_poll_frame(inlink)) <= 0)
return count;
/* request frame from input, and apply select condition to it */
select->cache_frames = 1;
while (count-- && av_fifo_space(select->pending_frames)) {
- ret = avfilter_request_frame(inlink);
+ ret = ff_request_frame(inlink);
if (ret < 0)
break;
}