From patchwork Sat Mar 14 16:32:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18193 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 96A9D44BAFC for ; Sat, 14 Mar 2020 18:32:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73047689C6C; Sat, 14 Mar 2020 18:32:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E87068818C for ; Sat, 14 Mar 2020 18:32:26 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id y2so492686wrn.11 for ; Sat, 14 Mar 2020 09:32:26 -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:mime-version :content-transfer-encoding; bh=YYKvfVYpxLhlI0Pe56H41mIq3sROZr8aEKDprESRo3k=; b=jM68WRpA7OHmmO5d21VIa5XL5OMeIm1mD2bPyfEaNGqYBbpx/lgt2gcu/a0P0FzYKx xrXW6EFg64Y5QT7IQI7uFnQ0kN5KdhYy2Ys1xaDW//wwOx250LvD3rV3pfPnjHmLREAY zsha2vZheTv/JRrwQlLfoqAHLihkTsO6UV4lKguuRdU7Zd73wjIuo2YtyuD41rmFgEo1 jkWH81hjU95l4Av9w9gRz8Bz+G0z4PNMJRQuG0xKfG3AYRjadOnke6t9XsgKxH+PxRAo exQaH5L7fqSMWUik56nmS7kjj6M77wLbifIzr9dakGtlVRCELkMmAs3OvNP1e/VH30pn tYFw== 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:mime-version :content-transfer-encoding; bh=YYKvfVYpxLhlI0Pe56H41mIq3sROZr8aEKDprESRo3k=; b=LB2eoThKKjjUhPyhU5JaHkYAupuGqVTpmBRKGrDC4tb/+zJbzjKTMDAs5JIRfLjT58 X4rvg8FvTljbs2HkzP9hnTG8ce+plxnYMVjvh0AjfkxHuYAixGxuvHNxmWHODgDs8UAV L3ldcppS9czyH9JW/dnX87YV2yhC3vSe5hWLjxAN/ULsP+QuOqb+gKH1pxV3nolP9cIg R8xythavbfDzDCV/WZt2WawuTBmmQgJWMHrTGyh7pXfjzXNWyqHC4nM1P1AZ9t7hizf/ 3RIwdbnIAOy5xNoC9zxPC0moRJxDzigD4yfbPCCR42YchVcxaqsiN9+q4W5oTeRM62RE IiPA== X-Gm-Message-State: ANhLgQ2nHFX8JtzgbxfhMLnfWgWD1kQEX99qPyi6dEtpKdHme+ys0TYh Dp4VBoVOE7Ap+C30s3CqeawB3qHp X-Google-Smtp-Source: ADFU+vu2phDQaXfODRU3mdT2t6ntI//TV/gpFf5lakJE138F8SPcPzL4YLehp7VksuiWaVXau2ogSA== X-Received: by 2002:adf:ea42:: with SMTP id j2mr13912760wrn.3.1584203545577; Sat, 14 Mar 2020 09:32:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id s7sm18621303wro.10.2020.03.14.09.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2020 09:32:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Mar 2020 17:32:17 +0100 Message-Id: <20200314163217.22706-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/nutenc: Drop redundant frees 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" Should writing the header fail, the allocations already performed will be freed during deinit so remove the frees in nut_write_header(). Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 44773924dd..1d48625815 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -703,12 +703,8 @@ static int nut_write_header(AVFormatContext *s) nut->chapter = av_calloc(s->nb_chapters, sizeof(*nut->chapter)); nut->time_base= av_calloc(s->nb_streams + s->nb_chapters, sizeof(*nut->time_base)); - if (!nut->stream || !nut->chapter || !nut->time_base) { - av_freep(&nut->stream); - av_freep(&nut->chapter); - av_freep(&nut->time_base); + if (!nut->stream || !nut->chapter || !nut->time_base) return AVERROR(ENOMEM); - } for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i];