aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-29 00:09:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-29 00:09:31 +0100
commit267290ce3b4d14a575cc32aae6aff30083db9c0e (patch)
tree83f8c52705e31084f88fc1e42c575ce06dae79b4 /libavfilter
parent8c1f98d9542d3463f46a3953eb0dd028a1e1b66f (diff)
downloadffmpeg-267290ce3b4d14a575cc32aae6aff30083db9c0e.tar.gz
vflip: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_vflip.c25
1 files changed, 6 insertions, 19 deletions
diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c
index bec449f26a..6077789273 100644
--- a/libavfilter/vf_vflip.c
+++ b/libavfilter/vf_vflip.c
@@ -69,41 +69,28 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms,
return picref;
}
-static int start_frame(AVFilterLink *link, AVFilterBufferRef *inpicref)
+static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
{
FlipContext *flip = link->dst->priv;
- AVFilterBufferRef *outpicref = avfilter_ref_buffer(inpicref, ~0);
int i;
- if (!outpicref)
- return AVERROR(ENOMEM);
-
for (i = 0; i < 4; i ++) {
int vsub = i == 1 || i == 2 ? flip->vsub : 0;
- if (outpicref->data[i]) {
- outpicref->data[i] += (((link->h + (1<<vsub)-1)>> vsub)-1) * outpicref->linesize[i];
- outpicref->linesize[i] = -outpicref->linesize[i];
+ if (frame->data[i]) {
+ frame->data[i] += (((link->h + (1<<vsub)-1)>> vsub)-1) * frame->linesize[i];
+ frame->linesize[i] = -frame->linesize[i];
}
}
- return ff_start_frame(link->dst->outputs[0], outpicref);
-}
-
-static int draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
-{
- AVFilterContext *ctx = link->dst;
-
- return ff_draw_slice(ctx->outputs[0], link->h - (y+h), h, -1 * slice_dir);
+ return ff_filter_frame(link->dst->outputs[0], frame);
}
-
static const AVFilterPad avfilter_vf_vflip_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = get_video_buffer,
- .start_frame = start_frame,
- .draw_slice = draw_slice,
+ .filter_frame = filter_frame,
.config_props = config_input,
},
{ NULL }