From patchwork Wed Oct 16 01:57:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15782 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 178D8449D91 for ; Wed, 16 Oct 2019 04:57:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F29A268A41B; Wed, 16 Oct 2019 04:57:55 +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 CDC3F68A3D7 for ; Wed, 16 Oct 2019 04:57:49 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id 7so1021518wme.1 for ; Tue, 15 Oct 2019 18:57:49 -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=4M6ezVdfz1bYuw6Ai2PZ/yN5bNeBy2510Es8gYiWcpM=; b=XXD0QjQ2AS/mmKKamMtjVuMkd6ioTQwUtlFFIOws6HnYotrqmRb1sM4p1hel2OlPEp K45QUk1a93gjneaFJKVy6M/maOX4C+pLeAZti4s9rYAL8L1JX0HPcgrE/JZuGBrPo3U/ 5vm/zFabq9ukP8nFDRafrmAzQIYcT796awu1kp43HmO2H9s0aGqX6zZvZDLaShW0iw0q OsfICqRwvvbSOwhcJmmjYCo3D5rQsz4xnc6K3BgdVZpEtLD+cQM1LEwv8N665VvvmpFT Z0FbnhCfAIyNZFgb2CfK+SdlPOyW/3jyRWUeAOwm9T8vlWPI26S9Rn9etu1N0Bd+N56x 8dlA== 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=4M6ezVdfz1bYuw6Ai2PZ/yN5bNeBy2510Es8gYiWcpM=; b=ceDOwBtXm2CrsrEdQacqJ6Liq/wteBEgN2eDF6Hh2xNV2RWFnurCPQXwEu/Ncn5h9H 6N+NH/S3Bj+Qe8ZTRiBYHc0wCSPJNFpax15ZymsGqeLhzVwyu7cZ0ZFeCYbQXwyTTtfs QoJozilkE6aoFLTsl+rLixvDzyEBNA/eTo3H+NY36mHTjjvUkYPzv3thK7iLaeSLe6Aa wajYwaYppr7kJZtZnNY+uRYmcB6gXXzNyVVLaNTwsKHsHen9tOa3jm4i3+qxQ/rpH12Y HD6xEdTOLYrzF7tNWaydOPE3poAWpCU2A4sF2M1uk5bEg5s1GbJKDgbmks3qtR3XG4Cg mYaw== X-Gm-Message-State: APjAAAXur8yZRuBkvj25FFaISmzItgdWB1/D/Ttya/oDGshiuyoWWMaH NAtTkBOZyg2hLIwSuPDo5Esn6KKR X-Google-Smtp-Source: APXvYqx72ymWo7P2mnO2DxZi2+LNHVftNRSHa1Pv47X1vPR0Zqygs/KcFYSd7HkT+AkjUWV2PKmlOw== X-Received: by 2002:a1c:7313:: with SMTP id d19mr1129327wmb.16.1571191069241; Tue, 15 Oct 2019 18:57:49 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id r2sm36567133wrm.3.2019.10.15.18.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 18:57:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Oct 2019 03:57:09 +0200 Message-Id: <20191016015709.19220-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191016015709.19220-1-andreas.rheinhardt@gmail.com> References: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> <20191016015709.19220-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/matroskaenc: Use ffio_free_dyn_buf 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" instead of replicating its behaviour. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3f9bd3445d..b924a64b03 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -391,23 +391,12 @@ static void put_xiph_size(AVIOContext *pb, int size) static void mkv_deinit(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - uint8_t* buf; - if (mkv->cluster_bc) { - avio_close_dyn_buf(mkv->cluster_bc, &buf); - av_free(buf); - } - if (mkv->info_bc) { - avio_close_dyn_buf(mkv->info_bc, &buf); - av_free(buf); - } - if (mkv->tracks_bc) { - avio_close_dyn_buf(mkv->tracks_bc, &buf); - av_free(buf); - } - if (mkv->tags_bc) { - avio_close_dyn_buf(mkv->tags_bc, &buf); - av_free(buf); - } + + ffio_free_dyn_buf(&mkv->cluster_bc); + ffio_free_dyn_buf(&mkv->info_bc); + ffio_free_dyn_buf(&mkv->tracks_bc); + ffio_free_dyn_buf(&mkv->tags_bc); + if (mkv->seekhead) { av_freep(&mkv->seekhead->entries); av_freep(&mkv->seekhead);