From patchwork Sat Jun 15 17:13:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13544 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 13D8E449D72 for ; Sat, 15 Jun 2019 20:19:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3FBA68A73C; Sat, 15 Jun 2019 20:19:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15D316899F9 for ; Sat, 15 Jun 2019 20:19:29 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id 19so3306339pfa.4 for ; Sat, 15 Jun 2019 10:19:28 -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; bh=8GOE4Ud0prs/mso3+OsI8DrSIVMQZB7yN0xcG5ZTJLg=; b=Ia83Arh9rcRUdrHqX1GD1fgAAjW5Hpz4K/dBWt2HlpxI/VcyGhDMl4JSyxPtGuwrTD vNy98ID4a95cSLJ7lHogctKcX4euFm6HQWUesDWqdHJvm05a0KSw8AmCZP0ZPpXTHyf1 DbXYfz3lIi3Rc1swUY/WWemRm8pVx/rV1X0/ktSPn9ve8XRYGeyQNk73Q2MpoYbiI8AF CkmjojyD9hPxQxZ8XqmLxhW4aExXWRt3vKja4IWlB6/20XkqGFdOVDK1IyjtONs3TZ5u B3DJnz9nWw28OT/uuumh48XCOxhibZgOozFzaJMp8TgNGbZ69m2hvdRFKEEZS+C2E8WG bXpg== 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; bh=8GOE4Ud0prs/mso3+OsI8DrSIVMQZB7yN0xcG5ZTJLg=; b=qRl1jtS67RLrDjINbVaFdTC7SsKJ9fLD5GIsTpXz4DK0NHXRm8s0wajBiVq4J50cqw BmTMRHSAyN6xP7JZ/1HJILu4/QedBCWI9O7/ORB4PAppe2nxmzelqYuKzwWEfo+jnjSx DSIlP+97Gmim3CCPqX7l2/DmiYIKYdVL5R6lQobg89U4shIlU+SqHEDrjuCkeRmtEGM7 tfljUfyIzABGqgMK172z9Rb1C1KPZOnxcSFh5Gv3nbkSc3deoL3DQP/SIxgBrxkeH4Vv z8cJZaNfNRLBJRVEiPCfbivE+ZWueTEezsSGhLUi5LuG0JR2mF8nUeiJz/rKLKMdGU0V pVAw== X-Gm-Message-State: APjAAAWBD2DpvzM+VaMikMiWwscMb2sZAU/p9A84gj992MX/ys5FkhZw 7dc9bAWRYArrsgE+hFAyj7O3ohmN X-Google-Smtp-Source: APXvYqx7FWPVPVoRhoEHw3oG91+T98R5zOoQB5vQnerkqLFqy9NaUJvuk5Kry9ZqZ0hdh/WSowni3A== X-Received: by 2002:a62:a508:: with SMTP id v8mr102649525pfm.87.1560618834732; Sat, 15 Jun 2019 10:13:54 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m31sm15421324pjb.6.2019.06.15.10.13.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jun 2019 10:13:54 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2019 01:13:38 +0800 Message-Id: <1560618818-14485-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1560618818-14485-1-git-send-email-mypopydev@gmail.com> References: <1560618818-14485-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 3/3] lavfi/af_asetnsamples: Remove the redundant condition check 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Redundant condition: '!A || B' is equivalent to '!A || (A && B)' but more clearly. Signed-off-by: Jun Zhao --- libavfilter/af_asetnsamples.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index a7e424f..bbc391a 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -67,7 +67,7 @@ static int activate(AVFilterContext *ctx) return ret; if (ret > 0) { - if ((!s->pad || (s->pad && frame->nb_samples == s->nb_out_samples))) { + if (!s->pad || frame->nb_samples == s->nb_out_samples) { ret = ff_filter_frame(outlink, frame); if (ff_inlink_queued_samples(inlink) >= s->nb_out_samples) ff_filter_set_ready(ctx, 100);