From patchwork Sat Aug 29 17:56:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21996 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 9F58A44AD75 for ; Sat, 29 Aug 2020 20:57:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 862BB68AE9A; Sat, 29 Aug 2020 20:57:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5329068A5CC for ; Sat, 29 Aug 2020 20:57:17 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id a17so1249622wrn.6 for ; Sat, 29 Aug 2020 10:57:17 -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=4c75kqXHpZmJEjHSC4YKPjc3vmCESdyaiyzQiooytsQ=; b=oG7zA7uee4LLnjEqfhVl0QEZAD1x6dZlk19SBjBFb13XFz+va4YM+8WRkMLEvwLxcS zUkZEC77HlP2pEEO6ewWtSP4tyTiNRnB3xaYZobXCzxW7/+9WPDpgK8AS2GSnCvAET4t 2z9yH1eDpMp2dM9AytbbOPA3WSbTHMhlxepLrVXrhra9Deo9DAKVk11OeK6F6SXnRUfN WabDKlKZwG9AJwlk4Xq5nZT5EMCQLdJn7A4nwjAlUZRGanY8bC1soT9ZenNG/PktvVT8 eTU/OCozfOdGNgdG/T32OZklV+IYYoLJ2w+wr78xfpgVaxpJAYgZmiyQo0hC/CTmt27r 9hjA== 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=4c75kqXHpZmJEjHSC4YKPjc3vmCESdyaiyzQiooytsQ=; b=AisBlLUK8Q+uRiAR1rd4We7YrRxE05eu/TfmeoQGI8o63GNlF07kyicp5anMcH/2RE RDMcguF7t5m3A+pUfdoOTCJOn0pHuBSqMmaLZADuycxdBmLwnSms5JRMjIlTm3hJgOZT dYz5OsUNR9NyMHrSFMJd6MhhgWlvZQV9oGU4bd+WnQCDwci9lBucjpuhFmyRPgEJCvQy tRrOzODC7+m9pRSIqcfQlwmKlvu3IZNgpJt1mlvpaHMiqr1330iTi7SJ4Km3qXSn8iVZ 0OJhBHcG4driPdzNAI4eFLQgOpt+dcf1FxQWG68IntFD8DM/pQGBaDRUrmO65/0xa0YJ N6lA== X-Gm-Message-State: AOAM532daHx7GPV43l65jT9VSL4LxHkC2b4sDu6czz5+M82/38UFiiDO S9+ZIitBvtkdohDMjdp8JnMORFE5IeA= X-Google-Smtp-Source: ABdhPJx2PqWOg7utBMuq1IlQctGT0iS0opQC69+rw296icVn0Gh+UaEFcvFFf5QYPgpmTwkEmif5VQ== X-Received: by 2002:a5d:48c3:: with SMTP id p3mr4133693wrs.69.1598723836453; Sat, 29 Aug 2020 10:57:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 10:57:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Aug 2020 19:56:26 +0200 Message-Id: <20200829175626.11682-13-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 13/13] avcodec/truemotion1: 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/truemotion1.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index b6481cbd7c..94782fef4b 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -491,10 +491,8 @@ static av_cold int truemotion1_decode_init(AVCodecContext *avctx) /* there is a vertical predictor for each pixel in a line; each vertical * predictor is 0 to start with */ av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); - if (!s->vert_pred) { - av_frame_free(&s->frame); + if (!s->vert_pred) return AVERROR(ENOMEM); - } return 0; } @@ -922,4 +920,5 @@ AVCodec ff_truemotion1_decoder = { .close = truemotion1_decode_end, .decode = truemotion1_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };