Merge commit '3fb78e99a04d0ed8db834d813d933eb86c37142a'

[ffmpeg] / libavfilter / vf_lut3d.c

diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c
index 3c1b482d4e5628910984c2476a49344094949828..cc15f20c1364de58eef0a2470b63961277f09bb9 100644 (file)
--- 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 }