summaryrefslogtreecommitdiff
path: root/libavfilter/dualinput.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-10-05 20:19:23 +0000
committerPaul B Mahol <onemda@gmail.com>2015-08-26 11:12:23 +0000
commit0190c372ef79740ddc546e9ce1877a908475d3e1 (patch)
treee4cc964790855da1cc85dd0d540d1e7004b6284b /libavfilter/dualinput.c
parenta16251a6d0401c772bd985f4c611caf97ca5e537 (diff)
avfilter/framesync: allocate FFFrameSyncIn internally
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/dualinput.c')
-rw-r--r--libavfilter/dualinput.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index 45f681078d..ea2007f93c 100644
--- 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;