From patchwork Tue Jun 2 15:16:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20078 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 17E7D449E05 for ; Tue, 2 Jun 2020 18:17:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0407568AD33; Tue, 2 Jun 2020 18:17:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5364968ADE6 for ; Tue, 2 Jun 2020 18:17:34 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id i12so1519984pju.3 for ; Tue, 02 Jun 2020 08:17:34 -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=TZhKi2ML6wRAW1trl/XyjuDUlEpbkrU1VFE5gpB2Ubr3ffq5OZYwThT/oIq7w9jrnr pdz1qYQje7I8YARNX/rEH9ZVIolL6CW1qjscs16UcephkGVPsdRJwAh7H+YJDw1Vze4d /20IwH8yX0k0/IQ6ZD2ZAcyizrdPRO9P0T9hm/NdaIQ0qqASgQGbaNdxnEmPSD6XuX8m /QlTsP9kEdphy2lc+qeguIqnKSz2hdtsv0CAzTX2RZeI4E4VMndVCucAyYrknBSmJWg5 oDYGAXZya0m4Ka8DcQxh7RhtvvPuHp3QKsF7S8qY96em7WT7naSzpbjITHSozl1Gu+S3 byFg== 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=DTNOhY6o+uZgWSWhgwY+jP1fCEceIhaDq+cjO0WTGiWbHf6bc79MnmMWzs1SKzkNS2 2I00Ws/MdxQ0yIc3+enFRJcUknpvqfiGCMEw7YrVaWFwkBMmiP/JXMf4o7yVzeDpygvz kyNRgBRVsI7zmpTIqqs9swHjJOwHKo0ZIsHEGtkIG/GnvroAyxIerCT0l3Adf5lziCtP tflGTNxBnQI2mN6EvRDwj2pp90rolrxGg+Hg1BbHjHexVygdLA2aQEfecpZ3aRKmbLis QJty7PWuyx3Uk4c0gHXZQ1Qz1oPT/59qpbV+6rk01GviQ3Qh4Ur+PvgOJXVyJuYwjZLT sIdw== X-Gm-Message-State: AOAM532pv8hJnh4iNHyREiOAYC8PyxJXlu/1Dh1ReOqXEwznJ7fpA5oR satsbZyh3shrumUogCbtDmQDX4CA X-Google-Smtp-Source: ABdhPJw3gd4HEVVHq5FdOzaXl8EWGCrb6kXYUYL8U2l1ctuFfUyi6vc5NiRmltNebrjMm5Bxypg/Mg== X-Received: by 2002:a17:90a:ba8b:: with SMTP id t11mr6501162pjr.191.1591111052639; Tue, 02 Jun 2020 08:17:32 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b15sm2958089pjb.18.2020.06.02.08.17.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:17:32 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:16:37 +0800 Message-Id: <1591111034-15499-9-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111034-15499-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111034-15499-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 05/22] 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; }