From patchwork Mon Sep 14 05:27:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22363 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 35A91448249 for ; Mon, 14 Sep 2020 08:35:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DCC868BC3E; Mon, 14 Sep 2020 08:35:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 722F468BC23 for ; Mon, 14 Sep 2020 08:35:01 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id i1so16292177edv.2 for ; Sun, 13 Sep 2020 22:35:01 -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=ZB6SmfBsGkDLLp58P+RzegZTFNzuJQQ8MliObjoDmqg=; b=gCEyvdexyMER1DIHMQY3uzNlOLNLbl3oxv/Q1EaTXzZ7thhN3+qiNxRXjPlMoUMu8D H8ZxrQFyEhbwIjqee6dq7EhO2gaypTMTWD6QnXHEc/wF7hwAzpHkiNbIX67VSFKL9ZNM 9u08sC+5VFlpyqhCSpRhmRcEyqGjQ4W9XmrIBB11+l8Gf2StUmQhcox1Lz27AAA6pc4w jSFEXA1eiBEqlJO3m3XbpyeUt/+TCjkHfLG+RtT3i+AMoSTfmXmBUu+oEPR+F+mHrhVL Oz+D173l0GANAPT3eFnOrDJzos9uS5ml//jmsjX6DPcWTJvVsx1kvGluHO+BZ6+IVuL2 fP5g== 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=ZB6SmfBsGkDLLp58P+RzegZTFNzuJQQ8MliObjoDmqg=; b=l6+1v5Xhx0hADwzLoYoWdUidlRpzzKfpH23g7YbOPWs84EN/bZlUOMdsa1SNNoYdF6 IvSwjd5LcoQq02izFf5Pl7ajfan30cOXlE15EDtJCh5DTTkoyfyXtQYvb8EF6mq7EiBI aqBeqNs/jtFWlNr4VezhdWKKImIEz+Wp55XD1Md9hgTgPdShDi/e7zXbZ/FecUDyawWY 7z67odpIXfw5Az33pin+S3CtEEDRHRxcTAsOl39TzHVQn3QV/AeZRZHPqE5evYOo1LmK lEbaoprcDnJmTLhnXXybaXdU9stzJ3wfZ6WzjjMo/EGEODOt52XrygNozWJaHR0QVCR4 TZzg== X-Gm-Message-State: AOAM531gbRq04KHwRso0Yfr3a1Sjf5JVo88R8ANFLGFbNXF+Vizve6o8 lwb+sYfFYnemVHbtiMgkAPah/klBoxU= X-Google-Smtp-Source: ABdhPJxFvuf4ZKvNgoIenkgQ6+3jKGkLvo7bgHdHO2o/1h83ZoPIBX/tV9L/kP6dwRN5P4bwWNYxkQ== X-Received: by 2002:a50:b046:: with SMTP id i64mr16150306edd.9.1600061306652; Sun, 13 Sep 2020 22:28:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f4sm8251421edm.76.2020.09.13.22.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 22:28:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Sep 2020 07:27:35 +0200 Message-Id: <20200914052747.124118-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 28/40] avcodec/c93: 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/c93.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/c93.c b/libavcodec/c93.c index e1808150b8..7e3bfdbc72 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -63,10 +63,8 @@ static av_cold int decode_init(AVCodecContext *avctx) s->pictures[0] = av_frame_alloc(); s->pictures[1] = av_frame_alloc(); - if (!s->pictures[0] || !s->pictures[1]) { - decode_end(avctx); + if (!s->pictures[0] || !s->pictures[1]) return AVERROR(ENOMEM); - } return 0; } @@ -269,5 +267,5 @@ AVCodec ff_c93_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, };