diff options
author | Paul B Mahol <onemda@gmail.com> | 2013-09-28 16:06:08 +0000 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2013-09-30 08:47:40 +0000 |
commit | cd1b22d8e8945a1feb8bf4c7848352c038d9378e (patch) | |
tree | bd066df57c0bfe8573d9e348527796e1564876f5 /libavfilter/vf_blend.c | |
parent | 5c7d86cbde71c3db566194096300ce052e026c38 (diff) | |
download | ffmpeg-cd1b22d8e8945a1feb8bf4c7848352c038d9378e.tar.gz |
avfilter/dualinput: simplify
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_blend.c')
-rw-r--r-- | libavfilter/vf_blend.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 3bc8eec26e..a5c8e9fb28 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -422,27 +422,21 @@ static int request_frame(AVFilterLink *outlink) return ff_dualinput_request_frame(&b->dinput, outlink); } -static int filter_frame_top(AVFilterLink *inlink, AVFrame *buf) +static int filter_frame(AVFilterLink *inlink, AVFrame *buf) { BlendContext *b = inlink->dst->priv; - return ff_dualinput_filter_frame_main(&b->dinput, inlink, buf); -} - -static int filter_frame_bottom(AVFilterLink *inlink, AVFrame *buf) -{ - BlendContext *b = inlink->dst->priv; - return ff_dualinput_filter_frame_second(&b->dinput, inlink, buf); + return ff_dualinput_filter_frame(&b->dinput, inlink, buf); } static const AVFilterPad blend_inputs[] = { { .name = "top", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame_top, + .filter_frame = filter_frame, },{ .name = "bottom", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame_bottom, + .filter_frame = filter_frame, }, { NULL } }; |