From patchwork Wed Dec 2 04:22:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24267 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 9BCC4449297 for ; Wed, 2 Dec 2020 06:27:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6452E68A534; Wed, 2 Dec 2020 06:24:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E78668A3AF for ; Wed, 2 Dec 2020 06:24:14 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id d18so1160112edt.7 for ; Tue, 01 Dec 2020 20:24:14 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=12r4SbrtXKN+Q0SS87JidIGgXp8dBMF0AjaXuA46ArM=; b=H9Elz+obgHGLXQ+PvA0XoY+raR93cQCQLgRYcJC+z3hxWmXXgQ335ygtJREVwNm/rW MPdxuyK7lnHn79yXVfVILZI/KcUE9tMn9wr/LfBhl9kox5Kg9YPs58RuM/oFAtwIPnls W0p1958egP8HV1YB+q991Ua5A9CRmTX8vRyZQFDTKP0EHuPSzwUv8XxLBTojPEO4kheQ nReuhf2SwGD32ZdyPzsXRIXB3dp+bAKRTj6AViSrzcPMFOdzrXp44mBaVmu/bDWASvA1 lGSlppz67rFK5PpFvGP8gm7bSLIA+jkH80LPknE+S3YE2w+yYw3haSLhTfCs8lCj7epo 5m6Q== 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:reply-to:mime-version:content-transfer-encoding; bh=12r4SbrtXKN+Q0SS87JidIGgXp8dBMF0AjaXuA46ArM=; b=a7XLXoHcg0KhACZiYsO019TObZFDD385XZRe3x2rXizQXoDBbSh85fl/W5beUH7Pko rLgG99CLIFGZCJx/PTwYp40s+0SYaBJcphATWh8Wft2wQH0ttUpe3eIv7y6E97L429d7 MU4IDShni2dOfmAHnYUB136bv58odREBiGfJZcx6pt3nrpsGLzopLD+5BQ5Vacs7IyzB NpqdrvyGraeaFRtQNYuDfvPVZdvuCfaIKVSN4t0ISIcky2UQUMVai56fzvsmqKEuFbjM 6wK6xkRn8jREc7PjtMTnuDiGBX3XWKq1a3g0uNPofpVD90E44pnznvKdeGl/Hx9hg4Ke fhEA== X-Gm-Message-State: AOAM530mqTT4+OT0ZRhHrWcG3ljgpiAFHJfZn1JegdDw/IrxqaqJXLvf QluZqBnsYMcCSn2+tQ11KJ6NA/25Sy5f2A== X-Google-Smtp-Source: ABdhPJxNvAU7rmXwq9yuvdhn4T0jYhJ++y9PMooR2fvNDSeApYPKIorhGc2OPDLdNw8/Dac/VY+/tw== X-Received: by 2002:a50:e18c:: with SMTP id k12mr849408edl.58.1606883053923; Tue, 01 Dec 2020 20:24:13 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id mc25sm265087ejb.58.2020.12.01.20.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:24:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:22:16 +0100 Message-Id: <20201202042244.519127-55-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 189/217] avcodec/sanm: Cleanup generically on 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/sanm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 9c11600b76..599ecc3737 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -470,10 +470,8 @@ static av_cold int init_buffers(SANMVideoContext *ctx) &ctx->stored_frame_size, ctx->buf_size); if (!ctx->frm0 || !ctx->frm1 || !ctx->frm2 || - (!ctx->stored_frame && !ctx->version)) { - destroy_buffers(ctx); + (!ctx->stored_frame && !ctx->version)) return AVERROR(ENOMEM); - } return 0; } @@ -1525,5 +1523,5 @@ AVCodec ff_sanm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };