From patchwork Wed Dec 2 04:21: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: 24237 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 8806544A255 for ; Wed, 2 Dec 2020 06:23:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63F43689BFE; Wed, 2 Dec 2020 06:23:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5ECF6883D3 for ; Wed, 2 Dec 2020 06:23:23 +0200 (EET) Received: by mail-ej1-f66.google.com with SMTP id ga15so680139ejb.4 for ; Tue, 01 Dec 2020 20:23:23 -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=kynDEEKlaZV5z98A9AVXh2gb6I7CPr0R/61sMtS/bbI=; b=O1rUPdKRL0d48HIBj3a3hinYBPHu/FWXKsN11R7niXqSbxCcvVwqrC5pnrOgG93EBP dWS+78D/6P9vCN8KWep+sX+kbN0ZqfZIzj2zO5gtbf7fYBYEmJQsSLLqLhL1vPM/vNmu nd6F9/2jQZtK9hJDsRUTzkI2usHe0yzgUr8tbv1lWBRsUjOzYbiwedCbkF08gAEjhsMT bj8cA24yv+5qeeqSrwJLnREzzyHSPWbOZCNOgz7qCQQHCzVjoQtJPwUnvMlk+OG1UBYs rO7t5gd+PYyaJytXG4/VkgYPs2znOR7kZuzlo9m/FmnyW0c8OsAz/mS6uqdkIRYVlDzg 8ogg== 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=kynDEEKlaZV5z98A9AVXh2gb6I7CPr0R/61sMtS/bbI=; b=rL7aKmbAQuUdHitUjsQmphZLyKdGMxmhnux8QOF7yd+HQJtr1S9YbCvqy5DVEY3Xtk 7962bxcWM3djjvUHkTFxugCRJYp+aalefK/ahu2CQwpnwjwbx7QSW0jAfPvU8N1K7K6P O79sntuQahmBqUHIAe9G30uxAPupMwD5oGG8R5mdLhCgT1ntGNv3eL2/+4B3JCExsm5C gDKAOLIuwC2TpGdAWRhdYAs605+4V8tUeNCGkB03TAii4qX12UFEaZCQxi4SGOnDfsd2 LsidqF3Z3DDhg1OFX8gpNBoYwrCVxS1iuziUN7vr0+CFt6r1h0TaqySck9kVW+jawx/U gUTQ== X-Gm-Message-State: AOAM530msu0ZHKToNWlUr9DJGzxsel+nCGf1905y0eUE6BpwfIwKJjJc Gg+L1IQUGXRoEzARaGqPUEvDVEBO0+2FXw== X-Google-Smtp-Source: ABdhPJzXbptp8+sCgX30YF2AFnQExQPgdn4aLV5tPW0vV6u1w+O8JAXZDP4cS+b8160tuB5QrDNwlw== X-Received: by 2002:a17:906:314f:: with SMTP id e15mr565003eje.496.1606883002872; Tue, 01 Dec 2020 20:23:22 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id mc25sm265087ejb.58.2020.12.01.20.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:23:22 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:21:26 +0100 Message-Id: <20201202042244.519127-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 139/217] avcodec/cook: Remove redundant free 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" This decoder has the FF_CODEC_CAP_INIT_CLEANUP flag set. Signed-off-by: Andreas Rheinhardt --- libavcodec/cook.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 93c51f5829..f552a57415 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -236,10 +236,9 @@ static av_cold int init_cook_mlt(COOKContext *q) q->mlt_window[j] *= sqrt(2.0 / q->samples_per_channel); /* Initialize the MDCT. */ - if ((ret = ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size) + 1, 1, 1.0 / 32768.0))) { - av_freep(&q->mlt_window); + ret = ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size) + 1, 1, 1.0 / 32768.0); + if (ret < 0) return ret; - } av_log(q->avctx, AV_LOG_DEBUG, "MDCT initialized, order = %d.\n", av_log2(mlt_size) + 1);