diff options
author | Nicolas George <george@nsup.org> | 2017-09-12 11:23:39 +0200 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2017-09-12 12:30:40 +0200 |
commit | 549ef6ef9a8168281640b9cd0240abe071cbbda3 (patch) | |
tree | 532da957cfa1d83a09f86fc7a623e5942e7f19c8 /libavfilter/framesync.c | |
parent | 9bad5e53191092ee17c0a95c597cccd527594d10 (diff) | |
download | ffmpeg-549ef6ef9a8168281640b9cd0240abe071cbbda3.tar.gz |
lavfi/framesync: remove dead code.
Fix CID 1416960.
Diffstat (limited to 'libavfilter/framesync.c')
-rw-r--r-- | libavfilter/framesync.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index 5567d660ab..82d715750c 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -380,15 +380,13 @@ int ff_framesync_dualinput_get(FFFrameSync *fs, AVFrame **f0, AVFrame **f1) { AVFilterContext *ctx = fs->parent; AVFrame *mainpic = NULL, *secondpic = NULL; - int ret = 0; + int ret; if ((ret = ff_framesync_get_frame(fs, 0, &mainpic, 1)) < 0 || (ret = ff_framesync_get_frame(fs, 1, &secondpic, 0)) < 0) { av_frame_free(&mainpic); return ret; } - if (ret < 0) - return ret; av_assert0(mainpic); mainpic->pts = av_rescale_q(fs->pts, fs->time_base, ctx->outputs[0]->time_base); if (ctx->is_disabled) |