From patchwork Mon Nov 23 19:37:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23993 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 C19EB44A49B for ; Mon, 23 Nov 2020 21:38:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 994ED68BC02; Mon, 23 Nov 2020 21:38:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D4668BBA7 for ; Mon, 23 Nov 2020 21:38:14 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id a3so374450wmb.5 for ; Mon, 23 Nov 2020 11:38:14 -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=CTXHB2kJ38uEuVt8aJ+FyBLUjdvdb7psK2aoAAYzlVM=; b=vHCfe6aNB4txvoiT8HxfEGbxS/SCfY2VMgDMl3R4PYkPwjZa+6ZiGUXtpTtaHXoyAf XaDjjEGoEXYCplW7iaBGKNGmJfkBNEgd33sj8QNwThBUL4EU+48mRomdwn+9dknBV+ZS awVqZXrf+CdltrWLpiUUvgK7QntgPvWuKGFkkmoddGUbSyVR6m1ByQARb4bowSiOCIPa 9LBcrM0UFG6SQBRZgPtRYWouZ0KKgw647CY+aImHQosb0mxeGo2Y6gulz1sZhYCkEzcX iGZ5vUhA7KsvEfi9eOYeD9IPBr4dXd/7eZupdAjwC+AEA1nsB2FlUcz8b3kCNVTQQ3rK b5wA== 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=CTXHB2kJ38uEuVt8aJ+FyBLUjdvdb7psK2aoAAYzlVM=; b=FwInDaeXgQe/Zod9XEgGDTmf7htvMJ6MXd7/FGNbvwX1JNG79H2PNnMJJNvhRUF/63 Q6p28Trj7UXmvSV8moRfJQ3JGMa1YNbwiQapme6bJBdW1a0qvJcIx+gkCBGmzCju0Pzl Q5dx/qoYRIoBozxcVXFlbS0CULfw3cjCIG3YVZrtKzp0OFpRu4hteGYzrJ2su/xFGw2N JOsfLIM5im3kRnLPA7fOQiORsW85NXaH1Wahlb6PjU7a9biXZM84aeyLgGEa/BvedWTc IX2+gdHn3NIS5IuAX4RUjFjxe6EFdy976J0I9AvrzUuJVtE0QVhtyj6KGDZ9gwMADgE2 6JIQ== X-Gm-Message-State: AOAM533Puoux1s4jIS637eCZhPXJcfVZs6cpL8VuGRCcrmxj0pvUsoEQ pzU6oxVDymMn8tyRqB82wmWuuXLaJeb9iA== X-Google-Smtp-Source: ABdhPJzMLcg0ZaDQyNLaaXhfDWjlqGxI7EO99uSw5CYJILjuFVNZKT+nwVGT8ILgd8vgF2aBQUg2WA== X-Received: by 2002:a1c:2781:: with SMTP id n123mr479982wmn.49.1606160293677; Mon, 23 Nov 2020 11:38:13 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:19 +0100 Message-Id: <20201123193739.1249300-9-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 171/191] avcodec/nellymoserenc: Cleanup generically on 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/nellymoserenc.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 9d22ac8cca..e5c9806be8 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -170,12 +170,10 @@ static av_cold int encode_init(AVCodecContext *avctx) ff_af_queue_init(avctx, &s->afq); s->avctx = avctx; if ((ret = ff_mdct_init(&s->mdct_ctx, 8, 0, 32768.0)) < 0) - goto error; + return ret; s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); - if (!s->fdsp) { - ret = AVERROR(ENOMEM); - goto error; - } + if (!s->fdsp) + return AVERROR(ENOMEM); /* Generate overlap window */ ff_init_ff_sine_windows(7); @@ -195,16 +193,11 @@ static av_cold int encode_init(AVCodecContext *avctx) if (s->avctx->trellis) { s->opt = av_malloc(NELLY_BANDS * OPT_SIZE * sizeof(float )); s->path = av_malloc(NELLY_BANDS * OPT_SIZE * sizeof(uint8_t)); - if (!s->opt || !s->path) { - ret = AVERROR(ENOMEM); - goto error; - } + if (!s->opt || !s->path) + return AVERROR(ENOMEM); } return 0; -error: - encode_end(avctx); - return ret; } #define find_best(val, table, LUT, LUT_add, LUT_size) \ @@ -431,4 +424,5 @@ AVCodec ff_nellymoser_encoder = { .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };