From patchwork Fri Nov 27 17:46:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24126 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 C578D44AF9C for ; Fri, 27 Nov 2020 19:52:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4035568BAE8; Fri, 27 Nov 2020 19:48:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9340168BB30 for ; Fri, 27 Nov 2020 19:47:58 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id t4so6372084wrr.12 for ; Fri, 27 Nov 2020 09:47:58 -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=GIyjyQAvmCwYJjncnA0Kl+f1g0mRBVgZpsTGlwTZNfg=; b=VbBWysimi0m+gXxSsuacBvmSuZEUbhkbmjh4b+/hlhajVDDylOCvsXINhz+ejYZ45M +BsEzkj3DU5N/JEmVWavJoC9i3zAWmNTumHoctYupDcef9XozllEAOOTLKhic3DGuHEj JpceMIaCsKm4htK6gJDPz7qoHHZUSdD+XheFgIqZ/YvonDRRM/Ixvy81FVLQjTeKyLmv ax3y4lqPZdWXvGBLpaM2dkVX03n2vdlBfISHgbA7ecMy/S3McXOu2k0M+3Y5MwpnmEKt PH1utmMOrGPwK+cwIFM/9cE/CHNrrRRbDCZB5SejenGZXKbVgqhZX+JIADhwM/pIjMud X9jA== 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=GIyjyQAvmCwYJjncnA0Kl+f1g0mRBVgZpsTGlwTZNfg=; b=ij+KWTvAvtZDw+cnwDP0FclKF5eIsWh4DbTpyzsfma85G+DF75NpB0IPJXsDrUs+Mr PS1K11iVDFGqCaeHSPtrpo59KYPVlj3uDu3vbx6HTfWDEV06DQfdCAmNXICAfqPkDjeZ OuZjMR0zK6b0ZTn3d6C6QSh+ra7k3ePgPHMNG8/ChK6XSynQTik7Dhie79VYvkbilYDg oxQuDvjiwPgVhxOGeXHYzCUEQe0Mw0xyr+t2uqyvuC1rS3m2PLwK6b7E8SITJTgdab4v NOzNP3n6G7XMnBc/w0DlbrzG0bx4NPnxTc2EPH+JlKO4KksKuNxIZaj6kHi3EWH9qw3D Rmkw== X-Gm-Message-State: AOAM531oMU6L4zvCkLFJN/CWSoYZWJztFssJcpVA0a3SYeahj5GyGS1L 66JO00ei5azh40iQqEIYF1ywEf2hDXkACA== X-Google-Smtp-Source: ABdhPJzT6lf3QCqywAqpZzV3MI2WgqfRbmIo+1rBbbbOCNtdF8b0BdCGfJSGLhxgvTxbyKDhtDuuEw== X-Received: by 2002:adf:f783:: with SMTP id q3mr11943340wrp.88.1606499277622; Fri, 27 Nov 2020 09:47:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id r13sm9941700wrm.25.2020.11.27.09.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 09:47:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 18:46:52 +0100 Message-Id: <20201127174652.2838198-27-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 72/72] avcodec/pafvideo: 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/pafvideo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c index 22ae26ac10..1e5d891332 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -104,10 +104,8 @@ static av_cold int paf_video_init(AVCodecContext *avctx) c->video_size = avctx->width * avctx->height; for (i = 0; i < 4; i++) { c->frame[i] = av_mallocz(c->frame_size); - if (!c->frame[i]) { - paf_video_close(avctx); + if (!c->frame[i]) return AVERROR(ENOMEM); - } } return 0; @@ -419,5 +417,5 @@ AVCodec ff_paf_video_decoder = { .close = paf_video_close, .decode = paf_video_decode, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };