[FFmpeg-cvslog] lavfi/framesync: remove dead code.
Nicolas George
git at videolan.org
Tue Sep 12 13:37:06 EEST 2017
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Tue Sep 12 11:23:39 2017 +0200| [549ef6ef9a8168281640b9cd0240abe071cbbda3] | committer: Nicolas George
lavfi/framesync: remove dead code.
Fix CID 1416960.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=549ef6ef9a8168281640b9cd0240abe071cbbda3
---
libavfilter/framesync.c | 4 +---
1 file changed, 1 insertion(+), 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)
More information about the ffmpeg-cvslog
mailing list