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_overlay.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_overlay.c')
| -rw-r--r-- | libavfilter/vf_overlay.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index c3f1c2edb2..b5ade85401 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -549,16 +549,10 @@ static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic, return mainpic; } -static int filter_frame_main(AVFilterLink *inlink, AVFrame *inpicref) +static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) { OverlayContext *s = inlink->dst->priv; - return ff_dualinput_filter_frame_main(&s->dinput, inlink, inpicref); -} - -static int filter_frame_over(AVFilterLink *inlink, AVFrame *inpicref) -{ - OverlayContext *s = inlink->dst->priv; - return ff_dualinput_filter_frame_second(&s->dinput, inlink, inpicref); + return ff_dualinput_filter_frame(&s->dinput, inlink, inpicref); } static int request_frame(AVFilterLink *outlink) @@ -606,14 +600,14 @@ static const AVFilterPad avfilter_vf_overlay_inputs[] = { .name = "main", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input_main, - .filter_frame = filter_frame_main, + .filter_frame = filter_frame, .needs_writable = 1, }, { .name = "overlay", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input_overlay, - .filter_frame = filter_frame_over, + .filter_frame = filter_frame, }, { NULL } }; |