From patchwork Sun Sep 20 08:06:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 22515 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 8FE50449284 for ; Sun, 20 Sep 2020 11:06:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7735C68B750; Sun, 20 Sep 2020 11:06:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F011F68B736 for ; Sun, 20 Sep 2020 11:06:38 +0300 (EEST) Date: Sun, 20 Sep 2020 08:06:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600589197; bh=JFpTUGYkGjWh7STe6m4468u+nOhXREt8lr8XX5Q8+WU=; h=Date:To:From:Cc:Reply-To:Subject:From; b=WevM2LMjBIfnU1Em7awjW5MjNYRW4Hzk1DJ3c+mqXkda0bzdJf8LYIJV1DaF5+Ttv PHaV/dLsqXzeRdIvBXd4vILmQ+0ubEF482WsrKT3h0GW7YB7O4C5r2Dcc3gtNKjWvM 9/3y0iJENAg6ShZ+KKW5TH+XD6q7g1xSGhKr0CW+BX8OBQ2ZfN32oMCfhDqQxINNWl WgRV/nmVf3MuY3kht6rJLMBRtDifhY/JVzG75J0GU+hFtMjwiZmDAcb48U49ywdE68 Zt5uX0ZCsE/5+dHugvp/LHRtdTRHzwwukXcvw3/qiTfmgSu90NcW06JzbC8eZ251UP 7SlOAkdebKuTA== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200920080528.26200-4-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 03/10] avformat/argo_brp: remove an allocation 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/argo_brp.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index 27029d07b1..e57c20eb96 100644 --- a/libavformat/argo_brp.c +++ b/libavformat/argo_brp.c @@ -77,7 +77,7 @@ typedef struct ArgoBRPStreamHeader { typedef struct ArgoBRPDemuxContext { ArgoBRPFileHeader fhdr; - ArgoBRPStreamHeader *streams; + ArgoBRPStreamHeader streams[BRP_MAX_STREAMS]; /* To know how much of a BASF to give. */ int64_t lastpts; int hit_eof; @@ -101,16 +101,6 @@ static int argo_brp_probe(const AVProbeData *p) return AVPROBE_SCORE_EXTENSION + 1; } -static int argo_brp_read_close(AVFormatContext *s) -{ - ArgoBRPDemuxContext *brp = s->priv_data; - - if (brp->streams != NULL) - av_freep(&brp->streams); - - return 0; -} - static int read_extradata(AVFormatContext *s, const ArgoBRPStreamHeader *hdr, void *buf, size_t bufsz) { @@ -174,9 +164,6 @@ static int argo_brp_read_header(AVFormatContext *s) return AVERROR_PATCHWELCOME; } - if ((brp->streams = av_mallocz_array(brp->fhdr.num_streams, sizeof(ArgoBRPStreamHeader))) == NULL) - return AVERROR(ENOMEM); - /* Build the stream info. */ brp->basf.index = -1; for (uint32_t i = 0; i < brp->fhdr.num_streams; i++) { @@ -331,8 +318,6 @@ static int argo_brp_read_header(AVFormatContext *s) return 0; fail: - /* TODO: Remove once AVFMT_HEADER_CLEANUP lands. */ - argo_brp_read_close(s); return ret; } @@ -444,6 +429,5 @@ AVInputFormat ff_argo_brp_demuxer = { .priv_data_size = sizeof(ArgoBRPDemuxContext), .read_probe = argo_brp_probe, .read_header = argo_brp_read_header, - .read_packet = argo_brp_read_packet, - .read_close = argo_brp_read_close + .read_packet = argo_brp_read_packet };