From patchwork Sun Aug 23 09:50:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21830 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 96C4744B698 for ; Sun, 23 Aug 2020 12:51:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80D2568808D; Sun, 23 Aug 2020 12:51:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 099A968808D for ; Sun, 23 Aug 2020 12:51:06 +0300 (EEST) Received: by mail-ed1-f67.google.com with SMTP id c10so5505927edk.6 for ; Sun, 23 Aug 2020 02:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p7UvMddjUfpmknnToQIBMcBC7MXykZl3rij0j6dHcDk=; b=Opu/uGzoSv7YuoSLznVzwgbFtBqrnSDF7mI1X7U1aU6UeYnu13x+Oe9NfPOLXVjRnw 5Q/ts6k78Cpmrp6pWZ/F1a2BNEe6ZsfFUaLFMjfxbUA3xfGcdsglZOEzNE59LsvxJoXj B0HBWc6NzEeKZHPP/7GDn1VVdV8aIdFq9NnAsF7O+aPkMBcK03HeemO6f6HnfrEwpoTC Lc9+4NSy/NkMVGpXEfWNmaOrVqBl5wEIGNJ0MXOjBzNlS1KPRcX+RO7eSgwXCs18hL9h RiPCqwKe0L2L7a5GW6+YUKdA8AdjKLERAzqMmMxFN8QGC0Jt92O0WTIS4dquH/fMeNf/ tvqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p7UvMddjUfpmknnToQIBMcBC7MXykZl3rij0j6dHcDk=; b=N02RfFnSXDiEQsxazzIXIgRWEkKmPi0UU1ZSU4vNkLBSL2re7bP6US8oCzvQMniAPG O1aXofyOTxSc+Otib0kNltJb9TMlBapjBO0W54XnjEYZtZV0AoZVMBURHtbmUGShTk+u jVs2b5GEAln6SY2rBlxe24mcCEVNkGyFxs4PCY0PtqYb/BLJRTAYlE2BioPH0Sn20CLm GWJIXZMgNj8UBym/nsfftKfKNvSyxzqM90CBFlpN/P5c8sjE/vJDFU8LVjNlyA0IlFgX 0jyo493chAAh0ZRbwNebkVu1tVmVUOO4gPlX0GvufAp5wQrgvwTQVZQWfjP1Ze5r5GJs 0eYQ== X-Gm-Message-State: AOAM5338jP9iI4tifWYJVpWdv3P5nkcJzJ1kO//XqEfOBpDWx6Cvtrqq bn4lJaSZrROQ91DlkgSVuF+66eygUW4= X-Google-Smtp-Source: ABdhPJybvW9lzyvIH6T6yAIg+6qd414LeMqisl7DyR7niy01BEgUzq1O3GtlF3NbpapFVkN8qmwzHQ== X-Received: by 2002:aa7:dd05:: with SMTP id i5mr768903edv.324.1598176265137; Sun, 23 Aug 2020 02:51:05 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id v10sm5256022eda.87.2020.08.23.02.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 02:51:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 11:50:38 +0200 Message-Id: <20200823095039.18851-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822230434.11347-1-andreas.rheinhardt@gmail.com> References: <20200822230434.11347-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] avfilter/graphparser: Avoid check whose result is known in advance 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The result of the last check in code like if (p) foo else p = av_mallocz(sizeof(*p)); if (p->ptr) bar else bar2 is known in advance if the else branch of the first check was taken because av_mallocz() returns zeroed buffers. Therefore the above snippet can be simplified by moving the check and bar into the foo block. Signed-off-by: Andreas Rheinhardt --- libavfilter/graphparser.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index a52916a146..f55737f8c7 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -266,20 +266,20 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, if (p) { *curr_inputs = (*curr_inputs)->next; p->next = NULL; + if (p->filter_ctx) { + ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx); + av_freep(&p->name); + av_freep(&p); + if (ret < 0) + return ret; + continue; + } } else if (!(p = av_mallocz(sizeof(*p)))) return AVERROR(ENOMEM); - if (p->filter_ctx) { - ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx); - av_freep(&p->name); - av_freep(&p); - if (ret < 0) - return ret; - } else { - p->filter_ctx = filt_ctx; - p->pad_idx = pad; - append_inout(open_inputs, &p); - } + p->filter_ctx = filt_ctx; + p->pad_idx = pad; + append_inout(open_inputs, &p); } if (*curr_inputs) {