From patchwork Sat Aug 29 17:56:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21988 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 31FDA44AD75 for ; Sat, 29 Aug 2020 20:57:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C97F689ABF; Sat, 29 Aug 2020 20:57:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EA7A6881BF for ; Sat, 29 Aug 2020 20:57:04 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z9so1886642wmk.1 for ; Sat, 29 Aug 2020 10:57:04 -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=hbn3R24+0/Gdgoc1hkgB9XDhI0NNAvxLZ1RQlWY1naw=; b=AZ0XF4zR+12oglTfUdS5cUzLezVNhpWJ1LoPCHXMNft5K5SAHBYdXPq266ClaL3ugR 8gCXhlVTYFjsUI2PX1OKVIfVwILODUSAwZWSbvfur6BREsYVPFM/5O3m2qGMenmxgC1l yBO+MfyiFPk701stCxWoqi5BZCnK+eeBZcCEbiNoWYykM+jwAIR9cu8bIFpGfhEB5EjK arvJvNd4+EJO5ee59bvE13McOp1LpUprWxJbVdLjUSMhwuVTi4LgojAzV7tztRhHqFv5 ILh+UXFiB/CIsuXjcVXXh3jEIUUvC01iPYdBqFXqsy+2aNRzBIZGJeeI5Faj9wIAUjrm Kt8g== 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=hbn3R24+0/Gdgoc1hkgB9XDhI0NNAvxLZ1RQlWY1naw=; b=gnwlTyaXfYYVzcAQDZ6o4w9h6cpUS6JE+VDCJwpM2VMpHo6Epf7lItDRgtYylZ/aIO n7FFPoe/qe4oCTdHqqAGq+8tq1R/ILljFqeFbgpz+N70FrZ7eukZJwov7i02CBRc3ccl nUOAQKO/HMBAeNsVkQ4JWEbYjJQNq0Y3pzTINTtNi8mBdugvkzEkn60BY4jACjQbxh/u DFEZMVVjjJtprz3mBSYNAaT1qbCU7PZrUGfgYlYJir2bWLtPoAjFWldzecRbUSJceP0g FronTR7SD1GK43wMKaLIEiXbtF5lPs7lhvbNWuMA3EHUOWh9DWrdfLkp/t8KDMUS9KWI G3Xw== X-Gm-Message-State: AOAM530FmWKj6L4HHqv2pgZUsKu99kY1a/MjEvgI35iJwarZ9Kk1rSl9 0UB2d/htuGSrAlpdkw9B8YeCw4wKWcM= X-Google-Smtp-Source: ABdhPJybTk6h3KLxYL4FeLM8GOcJUxgtZGcLiD+aWC2Xflk/f5Rg1aHPabMq0noT+IJFSCN8Xk/etg== X-Received: by 2002:a7b:c015:: with SMTP id c21mr3976104wmb.87.1598723823272; Sat, 29 Aug 2020 10:57:03 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z8sm4016734wmf.10.2020.08.29.10.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 10:57:02 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Aug 2020 19:56:15 +0200 Message-Id: <20200829175626.11682-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> References: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/13] avcodec/eacmv: 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/eacmv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 6f39d72b88..b239acffda 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -50,11 +50,8 @@ static av_cold int cmv_decode_init(AVCodecContext *avctx){ s->last_frame = av_frame_alloc(); s->last2_frame = av_frame_alloc(); - if (!s->last_frame || !s->last2_frame) { - av_frame_free(&s->last_frame); - av_frame_free(&s->last2_frame); + if (!s->last_frame || !s->last2_frame) return AVERROR(ENOMEM); - } return 0; } @@ -243,4 +240,5 @@ AVCodec ff_eacmv_decoder = { .close = cmv_decode_end, .decode = cmv_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };