From patchwork Tue Aug 25 14:09:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21908 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 7F30844B6CA for ; Tue, 25 Aug 2020 17:10:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6050968AA85; Tue, 25 Aug 2020 17:10:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EBF168A79B for ; Tue, 25 Aug 2020 17:10:09 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id dp2so11442535ejc.4 for ; Tue, 25 Aug 2020 07:10:09 -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=7JwcR2kSvu5wofYDafOSkok3TL6pUgf1m1O/GZgzuRI=; b=awyMuYUrQMikgFQcS4M3P+NDATQgike3zoEfoQvZLP86hI5Ir/s3+9y4TOsczfR1Iq 7yPYDPV1EnPs4mMqgwYz7RY315C8i/aPmlPqZj/AorJmIn8akolQz/pUGYthZ59uixFV 6Mn2DA+ESVlkjCLdk17ZdCT56gNFVMSs4bBZK+Z9Nc7RqdsoZdrJi4wkTZ9HbthDb+xE /gMcSZ6ooTB47BnKMwJNwMt/pkdHuR2JF7f4yU5MlfFouDz8LEJfpfzDP7bFJBU2lU94 sSwUwo5IwR+x2HT2Zf5NH5PRqgVw6yKbC9efZcNrFbyKwga0X3mvzZ24qJnqJeZc1xhA ktDw== 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=7JwcR2kSvu5wofYDafOSkok3TL6pUgf1m1O/GZgzuRI=; b=mcc/bcWXH9AMakmyf/11BVYXoj3ftFNMQoOrPZuTEWPqgaI9wnhrex5ctLBBigxfBG 6huaadBdyt1ufsq9odS+FYAeQwCvyR8PbvvMfJqgF/Y/TviTu36oxkSqWSRM0lR27rSU UDPnckmgPXb8WWxoPcWUE/rymeVStm88ezLbk/ctrhV5RpudTRnUOTloqbMbCXsBqyA0 p/KgKaKZCYknw4/emhH0O0vETgsKNad5lddHOD8LLFn1FWfMcY4d0AN3Dwdtqssdt4UP gYj7dDegPEmoG4xEyt+NGe8p/0kHIv5cqr9cLB3oYLe6HQPHfevrtDX6yg+gPbwmEyub 43bA== X-Gm-Message-State: AOAM531TFJVAtPs8ceB5Dr86Z4dbyUU6llaQ8GIm51xKJjnoeZFBfLHu JqPMdACzs/WZzoD4MSo2tcUFyD0VOKs= X-Google-Smtp-Source: ABdhPJwmAbAIo6eo4Fmf79COJeNIikC4inpOtJbNvd59IzdsiLthXi7XPQxpUYvwNNzvxdgWHJRblA== X-Received: by 2002:a17:906:e218:: with SMTP id gf24mr11241179ejb.469.1598364608342; Tue, 25 Aug 2020 07:10:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id k25sm10169806edx.96.2020.08.25.07.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:10:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 16:09:11 +0200 Message-Id: <20200825140927.16433-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> References: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/19] avfilter/af_anequalizer: Don't allocate outpad names 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" These names are always the same, so not using duplicates saves allocations, checks for the allocations as well as frees. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_anequalizer.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index 26cf835727..8cb607b2b4 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -192,33 +192,23 @@ static av_cold int init(AVFilterContext *ctx) int ret; pad = (AVFilterPad){ - .name = av_strdup("out0"), + .name = "out0", .type = AVMEDIA_TYPE_AUDIO, }; - if (!pad.name) - return AVERROR(ENOMEM); - ret = ff_insert_outpad(ctx, 0, &pad); - if (ret < 0) { - av_freep(&pad.name); + if (ret < 0) return ret; - } if (s->draw_curves) { vpad = (AVFilterPad){ - .name = av_strdup("out1"), + .name = "out1", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_video, }; - if (!vpad.name) { - return AVERROR(ENOMEM); - } ret = ff_insert_outpad(ctx, 1, &vpad); - if (ret < 0) { - av_freep(&vpad.name); + if (ret < 0) return ret; - } } return 0; @@ -267,8 +257,6 @@ static av_cold void uninit(AVFilterContext *ctx) { AudioNEqualizerContext *s = ctx->priv; - for (int i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); av_frame_free(&s->video); av_freep(&s->filters); s->nb_filters = 0;