summaryrefslogtreecommitdiff
path: root/libavfilter/vf_lut3d.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-09-28 16:06:08 +0000
committerPaul B Mahol <onemda@gmail.com>2013-09-30 08:47:40 +0000
commitcd1b22d8e8945a1feb8bf4c7848352c038d9378e (patch)
treebd066df57c0bfe8573d9e348527796e1564876f5 /libavfilter/vf_lut3d.c
parent5c7d86cbde71c3db566194096300ce052e026c38 (diff)
avfilter/dualinput: simplify
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_lut3d.c')
-rw-r--r--libavfilter/vf_lut3d.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c
index 3c1b482d4e..cc15f20c13 100644
--- a/libavfilter/vf_lut3d.c
+++ b/libavfilter/vf_lut3d.c
@@ -667,16 +667,10 @@ static int config_output(AVFilterLink *outlink)
return 0;
}
-static int filter_frame_main(AVFilterLink *inlink, AVFrame *inpicref)
+static int filter_frame_hald(AVFilterLink *inlink, AVFrame *inpicref)
{
LUT3DContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_main(&s->dinput, inlink, inpicref);
-}
-
-static int filter_frame_clut(AVFilterLink *inlink, AVFrame *inpicref)
-{
- LUT3DContext *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)
@@ -766,12 +760,12 @@ static const AVFilterPad haldclut_inputs[] = {
{
.name = "main",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_main,
+ .filter_frame = filter_frame_hald,
.config_props = config_input,
},{
.name = "clut",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_clut,
+ .filter_frame = filter_frame_hald,
.config_props = config_clut,
},
{ NULL }