Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'

[ffmpeg] / libavfilter / dualinput.c

diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index 45f681078d342560a1605216c663a8efe043a6fd..ea2007f93c744bceece4a7f83ccd120dc64888e3 100644 (file)
--- a/libavfilter/dualinput.c
+++ b/libavfilter/dualinput.c
@@ -42,9 +42,13 @@ static int process_frame(FFFrameSync *fs)
 
 int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s)
 {
-    FFFrameSyncIn *in = s->fs.in;
+    FFFrameSyncIn *in;
+    int ret;
 
-    ff_framesync_init(&s->fs, ctx, 2);
+    if ((ret = ff_framesync_init(&s->fs, ctx, 2)) < 0)
+        return ret;
+
+    in = s->fs.in;
     s->fs.opaque = s;
     s->fs.on_event = process_frame;
     in[0].time_base = ctx->inputs[0]->time_base;