From patchwork Wed Dec 30 23:31:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24695 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 B0F3444A7BE for ; Thu, 31 Dec 2020 01:32:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8877968A76C; Thu, 31 Dec 2020 01:32:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E43868A148 for ; Thu, 31 Dec 2020 01:32:37 +0200 (EET) Received: by mail-ej1-f41.google.com with SMTP id lt17so23690600ejb.3 for ; Wed, 30 Dec 2020 15:32:37 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=zwuP3KvmxEsuOWJ24EgdE+2JOuepzD2ui9x6l/lJSMU=; b=cNARBTIX3g2R1D3dguV1nsmO96P00dmBYiAmwn7BVps5ufY9jJ/HCrdK7iWc9ziy0t fJvZel2pSpkVHVsnCf2hommqEiQiSDUKOaqPeCWxKaSuGCklxuSgK/HIBDYgDsRKpdCM H6jaACmtuH8HpoDxt6O3X1lMb9Rd8nkYW85W961r/U2cH/0eeHGA4nX7ozlguAeEpsBM MZuxRb+xN+kwFvAaHMxPYfW37/+stk7pJCWnRMwM4L7nQOQF2eUhbmRNYMItib1+2m8h nGMLimWXuuwbs6n4ZzS1jRJ2fTqeVDOML3TyF2yTvWQkp0NmpeScfDMiZuiSLKCd3XsT 2G/Q== 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:reply-to:mime-version:content-transfer-encoding; bh=zwuP3KvmxEsuOWJ24EgdE+2JOuepzD2ui9x6l/lJSMU=; b=lzaei6pd9JZv6t6jiR9sgSEHChYYO6XsvE5kEJc6kVC7EHVmXwk+RrNwfanhBW4wcp WzNpeStBb8moWfyk0P3zUaNacuABPGS4C69JKUBIXp6yXawDMQ3NCWZrLmhF5bLkOto5 40i2xcCNaCaXOTM/WZHfygvnF6MffVwts3+JhF+YaFxSbr7NZwPZiCXEufPmb7glfw+4 G5gbLQxcEdfcrcZvwW6i2qKXURoNvrsLs0xo2xs8zausiumirYxAgl5vw4YfBuuX+xTV +pzxxapz9eFgoQXDFoxSENtbEDymoYAf3kfqGIGx5HKoOZTXPOBUzkS4k8sXS5IF4TXz Lhtw== X-Gm-Message-State: AOAM530bTVlFs1TmAOqmLEUHeliMl7dhYfjjb1SkpY0LvFaHyQQx9pR8 SzR15h1oaOvS0D5UKRPN9KVjRkVgG7E= X-Google-Smtp-Source: ABdhPJw4t9B5l2C3I3kXNI6nTdXoH8KUOu41iF0N+R4mvIq92EHkrjQwbUcHotgN5uxzIfsEon3I7A== X-Received: by 2002:a17:906:440e:: with SMTP id x14mr12385689ejo.77.1609371156588; Wed, 30 Dec 2020 15:32:36 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:30 +0100 Message-Id: <20201230233157.1055287-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/30] avcodec/opusdec: Remove always-true 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The celt_delay AVAudioFifo is always allocated during init, so checking for its existence in .flush is unnecessary. Signed-off-by: Andreas Rheinhardt --- libavcodec/opusdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index a08758d25d..86a3181e9d 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -576,8 +576,7 @@ static av_cold void opus_decode_flush(AVCodecContext *ctx) memset(&s->packet, 0, sizeof(s->packet)); s->delayed_samples = 0; - if (s->celt_delay) - av_audio_fifo_drain(s->celt_delay, av_audio_fifo_size(s->celt_delay)); + av_audio_fifo_drain(s->celt_delay, av_audio_fifo_size(s->celt_delay)); swr_close(s->swr); av_audio_fifo_drain(c->sync_buffers[i], av_audio_fifo_size(c->sync_buffers[i]));