From patchwork Tue Jun 2 15:26:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20109 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 01119449383 for ; Tue, 2 Jun 2020 18:28:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCFA268B133; Tue, 2 Jun 2020 18:28:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E26668B0F4 for ; Tue, 2 Jun 2020 18:28:16 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id 64so5190354pfg.8 for ; Tue, 02 Jun 2020 08:28:16 -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=tuQBWsM6JZqdms+4HUkwZM64CQXFtNw2SY/+WUQXcoU=; b=ryFSsHw7VqJqAbK5yr+Rir51zDv/aTTFvxhyoHHBXbDaSWaw6gSYXIcxqGveGY4Ca+ bDByw5viLxxZFCGbFH4E17mhwfL7IFCAdBzNl2wXP+Br68Brrult4pflFkFtv2zksvSx UgdOhl84bg/6Ri2TQlvG9Z7hNzwLvFEqCZaqhb6+my7j5esJcJT8cQ2es2T0EbLDcHqb mEl2alQoMLTHJ02G6yLdJtTDUWv9HCwvvYzW/738Y31sR/GEqIfrZGdlz9OnMk9MMD7U 0yhRghzDcJq1nx9D6cKJnDhCpu52nPmN2FRYjYwH4h3IP/yE5rqS03hX4grACA/QNl0A Arvg== 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=tuQBWsM6JZqdms+4HUkwZM64CQXFtNw2SY/+WUQXcoU=; b=LoKGXty2iIp9DKWPzndnSijIspUWFYCOccxmKgmqK5CBaEOzcAqERJofjbjJnhJ4ud kP4CxMx2N+zr+dwIEnhfCpH0261gxU6zodbRrUrvf0x5gkHiXMI88eDeh8VkgReuXXdt QRRXJGOYg0fBOligbzefnZGCAjmfMVBqjdbWefQXSOPG2kJ+hPM5koA+fUrP/s95iO+L ferefoc1uXRN9n2/2abY91pSNb0xSqAvxuXx9zC3lLNlVrrw+3MK3pyANhm89foNJuT9 TykBSv/u4p7dJCcnGtt0o/glHM+dU/1ABok9LsNt3ys7iLla/iPu1wNygDSASoPskU8P TdcQ== X-Gm-Message-State: AOAM533ePszhooSIxbGh7SDMFVBzQp661S+h5yVF4dbaTgCt4ycatZfU 7bUxLWujauqIgn+IDTYotxLndVXZ X-Google-Smtp-Source: ABdhPJxW7dDdUyTFghhzEMVkvmi2xY3frXdcO7wFttLkxp2RLMv05Df8Z3pvjtXK0Mz8yV2dHfDtjA== X-Received: by 2002:a62:bd07:: with SMTP id a7mr8814373pff.311.1591111695071; Tue, 02 Jun 2020 08:28:15 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:14 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:41 +0800 Message-Id: <1591111618-15778-7-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 07/24] avcodec/aacenc: add FF_CODEC_CAP_INIT_CLEANUP 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/aacenc.c | 3 +-- libavcodec/iirfilter.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index db11e0c..189f5e0 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1115,7 +1115,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) return 0; fail: - aac_encode_end(avctx); return ret; } @@ -1159,7 +1158,7 @@ AVCodec ff_aac_encoder = { .close = aac_encode_end, .defaults = aac_encode_defaults, .supported_samplerates = mpeg4audio_sample_rates, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index b202515..749fa57 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -197,7 +197,6 @@ av_cold struct FFIIRFilterCoeffs *ff_iir_filter_init_coeffs(void *avc, return c; init_fail: - ff_iir_filter_free_coeffsp(&c); return NULL; }