From patchwork Tue Sep 12 09:24:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 5102 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp4058152jaa; Tue, 12 Sep 2017 02:24:12 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6NcHKLcWiC0+CdtaM6P6WzD3HkVy2xIgvsLTLGzpX4tZUpDDzo/k7Lwd1Nu+Ld7qH7hLY+ X-Received: by 10.223.173.84 with SMTP id p78mr7838077wrc.277.1505208252347; Tue, 12 Sep 2017 02:24:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505208252; cv=none; d=google.com; s=arc-20160816; b=PX+8ubZbj/aPLlAmRMZO4BqvP5nB6ip7SfMobjwgzfuv02m+JQ3778dbjlCH8Q2ltS GeyfAx2x02j+VP9WOEJ7cUrrGa1NT5xOH3vLPAyndpALpZ/IeRtdxCqZ4lBhpMa7SEaj iEJUFrnvlSKrX7YKZddRD48Qc7ko26mDYRjzdrMw5dr52pbwirYei/6JGtoCGPXARAzK cH6nXeatTWkHb6eOJAQMCcfCx9+OeWDVdvC6mhgzHjyTobYQSKmdI6vxw9hSwjIIwU4E A/58X/pwOXTU3UI4qlQeKPHWps5PVpmKHQ+f7T7Gernx9A6KHfyk1WklIG2saaXuInnu iMuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Qg99YD54E71iF306Zv2tA6VVolfRCo2FKorE9s0GsqI=; b=eQeu3/+KPdhkz8Be43JrEFPbnQnpk0BtOper+s1UlcDN39PEG9fh4RDtrnAXLKKkyi nB+bMFAtxgFfBYblWBMWgpmJ3+8UYW/zs3rQ2LsJ7DHzqcwhtnTKa6+Dgp/P55A3NgAe zlExu34xfxu6M4Ue5jnITZzlqEp4YCRxTlEQXySQQB2U3m8uCE2HUycM1b8mlURc5TmG Lbo3feRXDUGDEKSJrXI7oBv+2oXQTRKDO3GTv90mcTeFIDUZ7kSM9s2GIFGuNCvg3I72 q0+hy3gnMYXSlDByHhdcxTpIsu+XAKbqN6zmGvcJ9FICRxXwTH1qyjgRnZIVKpDT666P wFPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i202si8813564wmf.180.2017.09.12.02.24.12; Tue, 12 Sep 2017 02:24:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9ABF6689D4D; Tue, 12 Sep 2017 12:24:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADD47689CFD for ; Tue, 12 Sep 2017 12:23:57 +0300 (EEST) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id v8C9O2Jo099018 for ; Tue, 12 Sep 2017 11:24:03 +0200 (CEST) Received: by phare.normalesup.org (Postfix, from userid 1001) id CF45BE00CB; Tue, 12 Sep 2017 11:24:02 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2017 11:24:01 +0200 Message-Id: <20170912092401.22222-1-george@nsup.org> X-Mailer: git-send-email 2.14.1 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Tue, 12 Sep 2017 11:24:03 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH] lavfi/framesync: remove dead code. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix CID 1416960. Signed-off-by: Nicolas George --- libavfilter/framesync.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index ebfbcaf090..be9f99c451 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)