From patchwork Mon Jul 13 19:42:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20998 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 A016F448AFC for ; Mon, 13 Jul 2020 22:48:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71D1D68A561; Mon, 13 Jul 2020 22:48:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C79468A2D7 for ; Mon, 13 Jul 2020 22:48:31 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id f2so18011244wrp.7 for ; Mon, 13 Jul 2020 12:48: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=J/3bE9BomYS5QDM4FIxnLdVMXiRCroz0olJdWXdvtO8=; b=iGwmOqMmQorAQ+Xv1zA75IvSzT7II27s0HoR/K1Lds59//jk1WpVe/3zm35pKXdB8y uaKRXBZEyl/KadsCe7hSsJeeLqyrIinkBBNnHsoyg/++GztOjsojlvyzfY5xg/GzgaUM gIz/UoqafcaaOKnKJXlKbDrwsTo7QXtFA0HIZz0EY0P9tirgg7z7dtgw6vcCjBfN3aml ri1qZPE1Lf5bD/XxqsonMuT7agA7ildddDQWDlEnhkcjsKu7Yqb4zLVAA5/6SvoFiQL8 NPQJnGL5uJGmHJi0bd07RjwwzX23oQvkBR5+k7pBhPJ/vN87DdETHyVn2+8JM3dc0wcL CGaA== 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=J/3bE9BomYS5QDM4FIxnLdVMXiRCroz0olJdWXdvtO8=; b=LeAatSglydhV5SJFIZ/jq0t31U+hY64GeRkR0wjwoxIAvu+wTwRqQqfxp2r1ZT3E/l EmLy4qY2ei0JDdlNm+EHrwZ+cqFtnsVRcuAQtmKKAETfFA81GLsns3/4bYA1pdoSAA0X zdSaQRgP+ksNp3BbicUA86xcRXjfKsUFxOasy5dzp8fMJ6MFH1NDRnBUZFpWZAdAgIOG uhjauIoXU4B8X5wGLCfvp4OJsQW1PU+8F4aObrye8nhZ99gcnb4PfOLWopwmqR5Oei5B lYUXYLT5saX8X2Pg3JTRsQ0aIPEAzeYEnra8qDLRIH3yAkfPHJCp/p6uZ/REc0JBMak4 FvpQ== X-Gm-Message-State: AOAM531sqmv7ru6c9b+F1HWwXx6PLfgQi4EDM84cu/yyGxgYO1Uc0aaO Wlht2iP5vJJtFOMVi9XMbgOCjowt X-Google-Smtp-Source: ABdhPJzqg9aCe1hxR+aDJ+nqKikESCBQp/PYtzkWt78yUp/e593zCNJiZHB4Hzr+3Ap+UTwagr0edQ== X-Received: by 2002:adf:de0a:: with SMTP id b10mr1145193wrm.72.1594669710405; Mon, 13 Jul 2020 12:48:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id h5sm27532278wrc.97.2020.07.13.12.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 12:48:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jul 2020 21:42:09 +0200 Message-Id: <20200713194211.30244-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713194211.30244-1-andreas.rheinhardt@gmail.com> References: <20200713194211.30244-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/au: Remove redundant av_freep() 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 av_freep(&key) in conjunction with the fact that the loop condition checks for key != NULL was equivalent to a av_freep(&key) + a break immediately thereafter. But given that there is an av_freep(&key) directly after the loop, the av_freep(&key) is unnecessary and the break can also be added explicitly. Signed-off-by: Andreas Rheinhardt --- libavformat/au.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/au.c b/libavformat/au.c index b419c9ed95..c4a32ff76c 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -107,11 +107,11 @@ static int au_read_annotation(AVFormatContext *s, int size) av_log(s, AV_LOG_ERROR, "Memory error while parsing AU metadata.\n"); } else { av_bprint_init(&bprint, 64, AV_BPRINT_SIZE_UNLIMITED); - for (i = 0; i < FF_ARRAY_ELEMS(keys) && key != NULL; i++) { + for (i = 0; i < FF_ARRAY_ELEMS(keys); i++) { if (av_strcasecmp(keys[i], key) == 0) { av_dict_set(&(s->metadata), keys[i], value, AV_DICT_DONT_STRDUP_VAL); - av_freep(&key); value = NULL; + break; } } }