From patchwork Tue Sep 8 21:18:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22185 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 07C3A44BD83 for ; Wed, 9 Sep 2020 00:19:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E220068B705; Wed, 9 Sep 2020 00:19:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E751E68B716 for ; Wed, 9 Sep 2020 00:19:31 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id q9so356417wmj.2 for ; Tue, 08 Sep 2020 14:19:31 -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=rfxGHm1i0CW1OODYCf/DHoUsRdZtLMcDPyfsyh+rk1w=; b=qMAaBHf7+nWsj6E8k2UZk6iwr+7NEdLCoB36p9BaVBSE4VXvkvEOUTNPi8E8xlXpPc gEc2DIUiAXu7ibj/cRmUO1SAgKdCRYBTWp2vmOq9TD9Ge3b/0YL/v/jnJ4XrYO7WzilS 5Noa719CQHy9XdKm0AOqb2D9j5OZ6nmOoCBJbJ2VlEtdJ5DbEiY/wOAC5hY8D/qJZIZX 4506JNbsNnwDqYlcAoUjr+dvmef3Mw2YvllF92l5d+d/JpgMEjnzrEer11zse91z8OFN S23xq/0NEXVzgwdA6cRzHYRSBRSJX+ux64fiHD6ES7NaTPa4U4PR/HzxyNi1tN+FQKqd vgYg== 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=rfxGHm1i0CW1OODYCf/DHoUsRdZtLMcDPyfsyh+rk1w=; b=osx31pF2oIxgIXjsWEHF/kTZFlG081RwzO76oapReOVkEA/POgige/dSmXRXuitZVs XQADxVILE6IYmlmrKZ8Am/diI7dNxwFDdqGJWZy9Ooo8iMrLQrADXknNYWDmx0KDSPux blCZjfHVIzbiS2h0O6WU10ZEiB6RP2rIfTtShjW4FUHyZbv260tMMpr09DFJA1q8yfak 0lF7cZbU5PzvFsIbpEDZR0KD5Gqp6eFWBkohxONwjk+dbu8g864MxNvUhCs7BW052SbX HghZ6hGn3wlnZnieQtJHy6gG1bGBL6vLeIGn70ynBnmhOgJ1GYAXc2lNqEIxC0uOyL7g imiA== X-Gm-Message-State: AOAM532Yv2kla15WfE82snauI0ZAQVD7aliTkm71feEerN7ONX5INAOV n3fKRyduXbhoYVtsPKWhm12SzGRef4k= X-Google-Smtp-Source: ABdhPJxaWkhIwowETAn8Q8o8J5Me86M6jygqmRrrXsbBUSUZ/CTQJ93J6Lk9oCssn83wGYwV0vDC4g== X-Received: by 2002:a1c:bad5:: with SMTP id k204mr322749wmf.111.1599599971137; Tue, 08 Sep 2020 14:19:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id a15sm1074304wrn.3.2020.09.08.14.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 14:19:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Sep 2020 23:18:42 +0200 Message-Id: <20200908211856.16290-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200908211856.16290-1-andreas.rheinhardt@gmail.com> References: <20200908211856.16290-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/25] avfilter/af_headphone: Avoid duplicating string needlessly 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" The string given by an AVOption that contains the channel assignment is used only once; ergo it doesn't matter that parsing the string via av_strtok() is destructive. There is no need to make a copy. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_headphone.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c index 32939af854..967f8ed5a6 100644 --- a/libavfilter/af_headphone.c +++ b/libavfilter/af_headphone.c @@ -100,16 +100,13 @@ static int parse_channel_name(const char *arg, uint64_t *rchannel) static void parse_map(AVFilterContext *ctx) { HeadphoneContext *s = ctx->priv; - char *arg, *tokenizer, *p, *args = av_strdup(s->map); + char *arg, *tokenizer, *p; uint64_t used_channels = 0; - if (!args) - return; - p = args; - s->lfe_channel = -1; s->nb_inputs = 1; + p = s->map; while ((arg = av_strtok(p, "|", &tokenizer))) { uint64_t out_channel; @@ -133,8 +130,6 @@ static void parse_map(AVFilterContext *ctx) s->nb_inputs = 2; else s->nb_inputs = s->nb_irs + 1; - - av_free(args); } typedef struct ThreadData {