From patchwork Sun Sep 13 02:57:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22325 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 78AFE449E91 for ; Sun, 13 Sep 2020 05:58:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CCB768BBD5; Sun, 13 Sep 2020 05:58:43 +0300 (EEST) 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 F309568BBC4 for ; Sun, 13 Sep 2020 05:58:32 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id j2so15063450wrx.7 for ; Sat, 12 Sep 2020 19:58:32 -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=JB2PVQPHi54rgR/B0bPpqxEy1zl6gt2hdQ8aCUPnXRU=; b=O8eW5dl9S2dQZczz/4lba/w43Sg2xc2F/T/EXO97Jk2UrF8OSBh8gWj+iUmx0UYg5f NTt5pZZLoT8KzRrENYwHRXxp6PT5p0ovbSK05YJyfRW7w/yYJvXZkKZWcyPvG6W3LSao IRtnTyLBQCVtZyZ81YnlLOy5k96nFT8Q42GmNRbRLPcLYoeFq8rGWPBWyon1REY5uEyX Q05w4CHUeRlR4WJqnuqmTnjiEAIrCIYUHeOMgIeITmvR9Ee6xKc7aZp87+r9tbPPVjWE TW+nwQTYrnNYAYwi5AYIMS/eT/Wd6cYueNSOZ5Ujaab4ge6vZnwRTrhs9+64Hk9Z+VAD jZ6w== 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=JB2PVQPHi54rgR/B0bPpqxEy1zl6gt2hdQ8aCUPnXRU=; b=cOps+BbdtajB7Bjju25sxEdGj3DXtF8xRnICkeqNAt7g1itbA0yYvfWKrgEaBUvRn6 K5waalaNZymX7qHrf+LAbg0C8OE6/xVl16lhbLNbNj0gbNuvYWpJk123XZeDfYacc13Q F9U5TNfK7cpiGyyRq9tXcYT/di9/Q49Szrsk3rPz7AHM85hy66uIoSsICwV11/dapnIe qSwmezS1fSR03mwVErwIrVkojAvxChGwYK3wS7obkoOENHIcSHVwRdsFI4pwaK2ykFvu upTKWFrdWG3s8FvI+uBnKlNq15Kn72GHJSL04vIcw2Trr5gg8++k4g9xi0v+wjwF2H0p hhsA== X-Gm-Message-State: AOAM533eBDhm+hXdNwn4j9GjMcOuoF0Rt0L6P7wlosHxMxWtOMr+3Xeo c8D5OZ6q1JMAhQegC9U3pxz8MIZmTR4= X-Google-Smtp-Source: ABdhPJywXGFc/B/Qr4uzSGH+g6inLHk0XCuTgETKoBKpCJTLrAwvOkuxjMf4jJlHRHWAi5kgcKvDVw== X-Received: by 2002:adf:ee8d:: with SMTP id b13mr9833308wro.249.1599965912174; Sat, 12 Sep 2020 19:58:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f3sm11883355wmb.35.2020.09.12.19.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 19:58:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 04:57:51 +0200 Message-Id: <20200913025753.274772-14-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 14/16] avcodec/tscc2: 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" Do this by setting the FF_CODEC_CAP_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavcodec/tscc2.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index 65fbb010f6..6aadb51ad4 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -74,18 +74,14 @@ static av_cold int init_vlcs(TSCC2Context *c) tscc2_nc_vlc_bits[i], 1, 1, tscc2_nc_vlc_codes[i], 2, 2, tscc2_nc_vlc_syms, 1, 1, INIT_VLC_LE); - if (ret) { - free_vlcs(c); + if (ret) return ret; - } ret = ff_init_vlc_sparse(c->ac_vlc + i, 9, tscc2_ac_vlc_sizes[i], tscc2_ac_vlc_bits[i], 1, 1, tscc2_ac_vlc_codes[i], 2, 2, tscc2_ac_vlc_syms[i], 2, 2, INIT_VLC_LE); - if (ret) { - free_vlcs(c); + if (ret) return ret; - } } return 0; @@ -360,15 +356,12 @@ static av_cold int tscc2_decode_init(AVCodecContext *avctx) c->slice_quants = av_malloc(c->mb_width * c->mb_height); if (!c->slice_quants) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate slice information\n"); - free_vlcs(c); return AVERROR(ENOMEM); } c->pic = av_frame_alloc(); - if (!c->pic) { - tscc2_decode_end(avctx); + if (!c->pic) return AVERROR(ENOMEM); - } return 0; } @@ -383,4 +376,5 @@ AVCodec ff_tscc2_decoder = { .close = tscc2_decode_end, .decode = tscc2_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };