From patchwork Mon May 18 11:11:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19738 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 6E5F744B9D4 for ; Mon, 18 May 2020 14:11:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 519C868AA35; Mon, 18 May 2020 14:11:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EA1D68AA98 for ; Mon, 18 May 2020 14:11:16 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id u5so4653806pgn.5 for ; Mon, 18 May 2020 04:11: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; bh=mglAxvDliEHAkBEVS2FaJ5oqloDMHuDng5v/Ey46xuo=; b=jGL2eVs2NaAqmuOZPoO9zkVi7/0DkOZVGNZbMmH5hLtBuDQcN+5rLigcIUou/ZjbT9 J9XcEZGB/IG4nhhsTkCDdZn1yjA/UAQyqcCMe7axY8LukJf1ud36sExzliDmnbYdvpZs 3k24Zxshwo/qYx6xg7Jh+5f5gU6uksyWcN0pAcpjSz+imlRsLsN74Vzbmg59xrFNjj4r n47LbrB+ilEatNqK0efejGk4cNs0gLgx9rb1ZskFkw/QqNqBlUJCdJ0ws8Wgm2hccjJh ftNkjWFnqhWrBJYWa28srpGpIvzX0JBCCf8mvmCiGtcbwW2GKRIqMPkgDCv7DZ8TsK9k RgHA== 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; bh=mglAxvDliEHAkBEVS2FaJ5oqloDMHuDng5v/Ey46xuo=; b=HgPPuCq+JD2Rkzf4TFrSSiCjT6DDpwBWJ0/MQL8vwPjWiyu9X7hRACkMJ/eRcM7D9P j1A16piRs6opjiCwIWE6aDxECAx3zybZkxaQHwjzqCUbMBlcgbvaE60Tz/9ghjukvOUF lUKC8/EusYLzpo9Z3Dpy46fMCs5PAsb6zODnq62g1qr4b+G3dWtMyRfLrlmGSk87K9C2 +IagnFKBMN0LYuWVyf6u6JYExbTj2B66p6jBkjpwAsMKOS7nOTfO6+Cqrp+AiJU/7ox+ clgDanEoi5qec52ntlQicjxaZaysN175gpXz8ZfcTxG92mvogCWZ+jFN1KIC14dZ9v4b uoFQ== X-Gm-Message-State: AOAM533YiUQjsDmwC+AxSMttBqc3cSk+V4TkUc1MNduh3MvIIvvYIiNc ZBkDmK4dQsi2Lde6GQcJOFXRWYR5 X-Google-Smtp-Source: ABdhPJw5GRaRGDoxBm4r8VGFNeNi4ZUnVyaMPVSrXgDNonSsmCrL+fwjutVv9r+UT7QURRPs6zJaVw== X-Received: by 2002:a63:4504:: with SMTP id s4mr4309680pga.175.1589800274378; Mon, 18 May 2020 04:11:14 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q34sm480545pja.22.2020.05.18.04.11.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2020 04:11:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 19:11:07 +0800 Message-Id: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/adpcmenc: 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 then we can remove adpcm_encode_close() in adpcm_encode_init() if have failed. so the goto error lable wlll be unnecessary and can be removed later. Signed-off-by: Limin Wang --- libavcodec/adpcmenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 668939c..1c84561 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -146,7 +146,6 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return 0; error: - adpcm_encode_close(avctx); return ret; } @@ -717,6 +716,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ .encode2 = adpcm_encode_frame, \ .close = adpcm_encode_close, \ .sample_fmts = sample_fmts_, \ + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ } ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, "ADPCM IMA QuickTime");