From patchwork Wed May 27 04:10:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19887 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 D13DF4495CE for ; Wed, 27 May 2020 07:10:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 903356882F5; Wed, 27 May 2020 07:10:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A3A6680879 for ; Wed, 27 May 2020 07:10:47 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id 131so2883501pfv.13 for ; Tue, 26 May 2020 21:10:46 -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=O8CCpXCw1c1I3gMQjQY4k2tnsR47EcxCPq7nFuaDO+w=; b=Xl4f+DeCDtPmD6Scf7ghbm4wOJXaLR/kF6jfBuqxQB4tmGbo1VIuf6Oc9F8CGDjpXf 67VMIBg6fWBU/xoVIfvco3ueuqNWupDsFXQs8iaKfB3aoDHMFyQeBK5o5RaJK9rx0WJE O5mRrauChJFV/8NRA7uOs8powsQod6FHThB1meKULvx/tHg7xsarMSWBoos0nRRRB3NE 0OKwhbdwG0RSmMAW9g9bTHiP5rCA7ZUpSpppOPP/Ija17VVOb7RxcreAHyurI/oIzwqc FuwyLOD1NC1zesiQHwS4omuslhSfxwN/fZalztZVyHt7ufAr9lPNEUKmKkjPySpowM1v A6EQ== 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=O8CCpXCw1c1I3gMQjQY4k2tnsR47EcxCPq7nFuaDO+w=; b=U7+ZoWDnWEcO4oQL7a1lODLNEl+rlitWU+yyVO3O3o2onUybT+zEFc9rAEvISP9+An cXANzlrFCJNgrwaKC8/kyTfEN1aooJ0pzXf9ZRy+/yYaQw9DUpP7wIrDVbKEgdFuApoW pPnNIRgcWwhlQ6ZTWf8pB49jKh35DEzGkAvaW8bAp3lEfXyG6GQjdCB/pOiY6KPkNqEz 8GDSKCj+lHnpqrSlY58i3i5AOPeHef2MwN/PGrlaUTJ/WT/GOqcwER3ynJSdOfxnLLj6 clrO2N6aZ3yw9J6tuILC+6u31J38QVmLDjnk0FEIoTvuoSi7Ad1THhSx9Kahna5rPOxh xfhA== X-Gm-Message-State: AOAM531JSEJAQ9DiFD7fs/CQuptFk+BP/YVytzo70/41OpGpHYcPfymI 4y9nOthbwncKqmsoqMpciSEeKar5 X-Google-Smtp-Source: ABdhPJw1+lulqfhSiFXlcDfHfXRjguRfb4Hs53oouMqOCNsw3KUJ1KTpmeqBmkxTjWeRdJYOSuQ5Ww== X-Received: by 2002:a05:6a00:1490:: with SMTP id v16mr1955174pfu.173.1590552644838; Tue, 26 May 2020 21:10:44 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 131sm871988pgf.49.2020.05.26.21.10.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 21:10:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 12:10:32 +0800 Message-Id: <1590552634-15101-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> References: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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 will 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");