From patchwork Fri Nov 20 07:19:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23788 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 AC79B44AF11 for ; Fri, 20 Nov 2020 09:31:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBA9F68BACB; Fri, 20 Nov 2020 09:24:58 +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 3F42168BA73 for ; Fri, 20 Nov 2020 09:24:48 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id cf17so4914644edb.2 for ; Thu, 19 Nov 2020 23:24:48 -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=YQLtcaX2wO0688ZcJd37wdCX99OgTLLdasAm0eIRnbk=; b=RQnJf/ItAuS2yXqFwOPkAI1echmqvz7tzvxoo9lIZz5Cx6bfXIuzgIYSYKEcPzcd2b xH2LTCmRPu8Ihc/EZxuYeJrTDWcYt2RXd0q3bVlCEdNAzNsHLy1anGtB36qWi/9XBW6D ruS934jIaOYIYdSs8+WNxANywXtVLjWXsehOSaYr4pZNMGOaP/qKaLuv4f7tgE2oxNms dBYK6T1WebMIyL4/6DFu2R9cagD8p8hch7njWrB4bo/+wcJnUQ3vf1OIl4gxCH6o0itW fSZGLbDDT7uIezsKJGSV4gbvBnndOpuMwh6LuMs72unpJSEpaloMXzD2SURzvWxbyRSB 7eRw== 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=YQLtcaX2wO0688ZcJd37wdCX99OgTLLdasAm0eIRnbk=; b=kiLiYKLsxU6cghHvcgg8JQbdvnhQBWLwxyyPiu3cFhd+C0b9tvwI0192hxfxq00Zkj R9Wtu36V1pNmD/0l6oGjSzTNJo3qJz5jw9ZDXpMTtPgmwgeYNHjMzj9J5GCFhQwMGtaw TyjM6DzyOaSQn69Se0OcXJBf/2p0E2K69/JBTvB8PGRYbW7szFIsxZChSL50F0SoA7gt t+K+9K3hBbEwZVM4g8BMfzFyX1vGvuVQdg27OfOYVgtcnO5YFGLGoctDAcxkkMVa59Zr meBnGKSQ38ojJN4QOcAAszLcEx8yserXMRw1flVTkNQXlrUuJT8nR5tU1xN1Qi5Y70sd cDYQ== X-Gm-Message-State: AOAM531iRIYM1ap3yylKJhyTZwZuQtBz0T/0MZTvL28zNQeE7yjJY6kM Ge36SfdRxPX3LnXXwo8jxhA5D8C0/bsjdQ== X-Google-Smtp-Source: ABdhPJzVRKTOFueegT2fB2hw6j5zivdJ3WyA2xOzdNEWVGzxf58P8PbLfW1cMbhB+NqvAIRsWeU01Q== X-Received: by 2002:aa7:d34e:: with SMTP id m14mr33178933edr.42.1605857087272; Thu, 19 Nov 2020 23:24:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:10 +0100 Message-Id: <20201120072116.818090-38-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 037/162] avcodec/mimic: Cleanup generically upon 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/mimic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 7a74b99086..6ceb5c9ae3 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -138,10 +138,8 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx) for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) { ctx->frames[i].f = av_frame_alloc(); - if (!ctx->frames[i].f) { - mimic_decode_end(avctx); + if (!ctx->frames[i].f) return AVERROR(ENOMEM); - } } return 0; @@ -443,5 +441,5 @@ AVCodec ff_mimic_decoder = { .decode = mimic_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context), - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, };