From patchwork Tue Sep 15 07:39:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22411 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 2D41444A52F for ; Tue, 15 Sep 2020 10:46:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0828368BC99; Tue, 15 Sep 2020 10:46:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9870368B9A4 for ; Tue, 15 Sep 2020 10:46:30 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id s13so2319908wmh.4 for ; Tue, 15 Sep 2020 00:46:30 -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 :mime-version:content-transfer-encoding; bh=iBHEwqxAMtdx7uOl3EfcdKJYucfqQ1E7SdWdlro7ing=; b=CzM/JH/AxiLGHdDgBpbj0XyGukR1J0k3eetpF02dEJm/eiU3J2PFYcft3JaKdDGYIc IfW1xxMgJqNKNlMI6degq40GXit4Fi+OO452ebv+HqkEwYn1PtyyjxosNEGIx/6FTBi7 EINqkevJeyenMIQv0DGU95J2WTNylQYj30DDjKLsVTIlrvvvhIOaPnyMipNNlVpbLcxa 7Br6KrFYyx9g83WvtNN1QFqQelqMdnH9nJnUArcRVvsxoYFgWyL6lso3t+I7RzeBuQy6 jKLD+t11Rxgl05tfYgMfdYFykFdrAKc3y+6FR9CLR2apHxUcs6Rs1ee2QshvzXCgAAMB kx+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:mime-version:content-transfer-encoding; bh=iBHEwqxAMtdx7uOl3EfcdKJYucfqQ1E7SdWdlro7ing=; b=uAx7M/bpyS38uLDpkcrEvrWPvH7N3zhHJqwQTOhDW74RGwETikDJY+ubFkkO+Dibqa 6NubovnTsKn0aNrMgwkoj2RGh9UJdN9MyUrIM0AB0sc+zhj7wtq9B5aE8gqzWP1ayiBP gPIP9Fj03itejeoUdzAAfvN9iUqdRjlwrmCkFT8r9obo9hL2YOZrb0GhxD5EAfrRB/z7 8XfHdf4YDqJhklJ0mHwAMSP2pLFWNhhaaowvsQjilsqjLmSkMgkOZ0tSxAQPxjwiu4+3 2UH9j9owtA7BXyb0X8jTEAbrVjf5F5pqDfnVMi5wRbE5rHwg3U5AxCOv/okXTs5UZXE3 5+9Q== X-Gm-Message-State: AOAM532/YApiA2d/Sql/+G2eE256BHvRVj5LQEG53hXZGdXWkSV9inWO OXldwm4pRA3KY1iRTgtyoe9RoN8Szf8= X-Google-Smtp-Source: ABdhPJyam3e9S7sM3eCk4cnL8AxFZ4rVNW+eRCLWDIRKXSP7eHmONXQNfpqe8AFRVdG9+64DgmD9HQ== X-Received: by 2002:a05:600c:28d:: with SMTP id 13mr3162846wmk.69.1600155630246; Tue, 15 Sep 2020 00:40:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:34 +0200 Message-Id: <20200915074000.102622-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/30] avcodec/flashsv2enc: Cleanup generically after init failure 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsv2enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index e2a603f312..851abdc822 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -235,7 +235,6 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx) || !s->current_frame || !s->key_frame || !s->key_blocks || !s->frame_blocks) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); - cleanup(s); return AVERROR(ENOMEM); } @@ -918,4 +917,5 @@ AVCodec ff_flashsv2_encoder = { .encode2 = flashsv2_encode_frame, .close = flashsv2_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };