Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

[ffmpeg] / libavfilter / dualinput.c

diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index 179c3efab6929b5dd9ec9411d5660befffd2ed66..97e15cbe0197262aaee63295cb95f59a66d79ed7 100644 (file)
--- a/libavfilter/dualinput.c
+++ b/libavfilter/dualinput.c
@@ -37,7 +37,6 @@ static int process_frame(FFFrameSync *fs)
         mainpic = s->process(ctx, mainpic, secondpic);
     ret = ff_filter_frame(ctx->outputs[0], mainpic);
     av_assert1(ret != AVERROR(EAGAIN));
-    s->frame_requested = 0;
     return ret;
 }
 
@@ -67,18 +66,12 @@ int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s)
     return ff_framesync_configure(&s->fs);
 }
 
-int ff_dualinput_filter_frame_main(FFDualInputContext *s,
+int ff_dualinput_filter_frame(FFDualInputContext *s,
                                    AVFilterLink *inlink, AVFrame *in)
 {
     return ff_framesync_filter_frame(&s->fs, inlink, in);
 }
 
-int ff_dualinput_filter_frame_second(FFDualInputContext *s,
-                                     AVFilterLink *inlink, AVFrame *in)
-{
-    return ff_framesync_filter_frame(&s->fs, inlink, in);
-}
-
 int ff_dualinput_request_frame(FFDualInputContext *s, AVFilterLink *outlink)
 {
     return ff_framesync_request_frame(&s->fs, outlink);