From patchwork Fri Apr 17 02:23:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19020 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 7DFB4448035 for ; Fri, 17 Apr 2020 05:23:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5959268BD0B; Fri, 17 Apr 2020 05:23:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20E8D68B5C6 for ; Fri, 17 Apr 2020 05:23:43 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id g12so1334622wmh.3 for ; Thu, 16 Apr 2020 19:23:43 -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=/fq/aHhbAovTrfxhILiExKMKokZ7Mf5lKDObPdSUeqw=; b=OaEMuVyQmxfrlYy+PRrhxZU1xuiHRFU3YnYk/uDnrEtjW8oRdEetEz2EMNF5n8ROXy 0SemPmE8dGVW0Klf//Rk/GqymPesQ7gCqe0FBFw5E0Cm07rfvIwChVu0bazdlQH7arRi dtZK9dhhDvLSZ/ysZFYRvZ8eoxghsMpyBONC9ODk9ZQwjaW34Lml2rtbECsbuFjAkuMo x/6mFKpG8PgX+lOGbmuRIcaREml3tlmnEsYdIyvTLdix5GpsItjP9yI6MbTgX7ZuI3+9 7GNy95e1ewXZktN6Ia76aD5wNzqtThioQ8+BbeilNn9lPKQqUNutSp7mXrpKO3onsIgn WeOA== 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=/fq/aHhbAovTrfxhILiExKMKokZ7Mf5lKDObPdSUeqw=; b=q+RkGtJFRGs2rdZ10J9N2YPkFbnNWJqui9oiuPDiYDdvHCH8V8g5hECH3hPRPRzKqq zhRlkLwYyKhQuhqsHDJkFsIiON2zGbpgV7kHg3wFfDG8jWqiSwOLVPaxVLhhVXV5Ly4U GKQ8VL9GzcSS1wx0k/vKAIzFBk06tuYRawon5sVX2rAdux6oVFtw1gFUuOxwcTImTLVE PisPGw9tNP5xGvRjlrfZllyiDkUmDzjIjomeM6vE1Ws8u64sP1n+Q1q70Go1SkxKLKkS KaEdkPbTYIrI96iAw6u9euLGzaOf7zdJn4uKf1KIWX5Nda1k3UBbE/Ggyp6v3lrNNi1H ZfLQ== X-Gm-Message-State: AGi0PuZb7EsiyPQBGBElxKkgIE/xsjYBkFCaPDXxQ5lBOCJRI9hlJl93 cWrnfxJW8tpFJ6t6vSmwrJCzjrqe X-Google-Smtp-Source: APiQypK+5zPJ8SwCfIx33IiONVnI4449NrcTq0ogUMtb9wj/bZr4VcJLBh0Zjp2I5y1pXXnfuW8cOA== X-Received: by 2002:a1c:2392:: with SMTP id j140mr871393wmj.136.1587090222283; Thu, 16 Apr 2020 19:23:42 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id e5sm30941845wru.92.2020.04.16.19.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Apr 2020 19:23:41 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Apr 2020 04:23:34 +0200 Message-Id: <20200417022334.30405-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/r3d: Remove write-only array 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" Signed-off-by: Andreas Rheinhardt --- libavformat/r3d.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 224bcf780d..7aa0c5a2c3 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -27,7 +27,6 @@ typedef struct R3DContext { unsigned video_offsets_count; - unsigned *video_offsets; unsigned rdvo_offset; int audio_channels; @@ -118,17 +117,14 @@ static int r3d_read_rdvo(AVFormatContext *s, Atom *atom) int i; r3d->video_offsets_count = (atom->size - 8) / 4; - r3d->video_offsets = av_malloc(atom->size); - if (!r3d->video_offsets) - return AVERROR(ENOMEM); for (i = 0; i < r3d->video_offsets_count; i++) { - r3d->video_offsets[i] = avio_rb32(s->pb); - if (!r3d->video_offsets[i]) { + unsigned video_offset = avio_rb32(s->pb); + if (!video_offset) { r3d->video_offsets_count = i; break; } - av_log(s, AV_LOG_TRACE, "video offset %d: %#x\n", i, r3d->video_offsets[i]); + av_log(s, AV_LOG_TRACE, "video offset %d: %#x\n", i, video_offset); } if (st->avg_frame_rate.num) @@ -400,15 +396,6 @@ static int r3d_seek(AVFormatContext *s, int stream_index, int64_t sample_time, i return 0; } -static int r3d_close(AVFormatContext *s) -{ - R3DContext *r3d = s->priv_data; - - av_freep(&r3d->video_offsets); - - return 0; -} - AVInputFormat ff_r3d_demuxer = { .name = "r3d", .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D"), @@ -416,6 +403,5 @@ AVInputFormat ff_r3d_demuxer = { .read_probe = r3d_probe, .read_header = r3d_read_header, .read_packet = r3d_read_packet, - .read_close = r3d_close, .read_seek = r3d_seek, };