From patchwork Wed Jan 1 00:58:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17091 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp219621qvb; Tue, 31 Dec 2019 17:01:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyBKSFA1kVKPjaqDJYMHMD/RmvUy/eqXcVEnYifZBcrBsY+FUKxOdsBlrU2tOn8A+P464XJ X-Received: by 2002:a17:906:4d43:: with SMTP id b3mr80900835ejv.109.1577840490557; Tue, 31 Dec 2019 17:01:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577840490; cv=none; d=google.com; s=arc-20160816; b=Y2gDwNhTS8JGWcEqSaM4/4FLRBxXa6te2nL/GZFkwrSMb8Qyd16MnoUBjD5wNFUQ4N usHlU1IOs8ix8eOKQdXrPxw6U2KNif+9l4hRGAOhnuSJAJesGruSlCNwMEOL6yJo0USz 6tZOp+mSFaK0V8qo20jXPSLkylNWm3SY6aNDzON1pAscd7K+E7g3fcHQaCnEHgms0eGH LNmZ12Qmvy70cXyBnVJAz+iXQbi+dtDRETHYEb4JA9hgVC4/qxJ2lr/TDM8U+oHq0t8e yejc9+SbSnysWfbPHUwfxmZok9TqJv87X+59nMoG8BL9HNAWsdClLbWsfcp4yYi/ZFnW CezA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=aE9yhSbJu660g7/BrGGA0gQIphgOklddT1ce2GfaGHE=; b=KELy9Rh9moG83YvyzZvLj2JL13cvpMY7Mm4kCHxXKH9pScX8I1NyKbPjb+kcFXxbmm FQbsm/yW0Y2SU2fU68CZwEc9W9ypIXVajksMChh8b87j/YBMc3ysZ+dAfpwApcXKsYnL 2mr+iiIc7NOzHe6MyhAUWZmOtf1mkp1+WYvhfRe1KzU/7oxT6cDb3pA+UWRJB69Q7KyM /8O0E6axWjz85l+35NFjzs8TmHTB5lY7xzGjZ8HmUIm+izRxsgnp5nck4GQ2flI2Xs4E vi6L81hCITSpnkIaF6pjkkHx0tlR9F8Rb6fFnz71ISZ5C23azwB3OAEN2UE1LwN0dbwD hm5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z5vXB6DL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u2si32040215edy.95.2019.12.31.17.01.30; Tue, 31 Dec 2019 17:01:30 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z5vXB6DL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2801868AE48; Wed, 1 Jan 2020 02:59:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A471868ADB0 for ; Wed, 1 Jan 2020 02:59:14 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id q10so36209829wrm.11 for ; Tue, 31 Dec 2019 16:59:14 -0800 (PST) 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=9PY8dbaD09Lv4B5/apSnbN+qpLesrLjy8w40ZkrsN1E=; b=Z5vXB6DLGQenbUFSlYZm+xQYoyI96rxqXZptDg4RWReXwiv4lmj078yTNnga7D0TR1 7hGPeZZGsM8WOWbxshnFZ/aJ8CIsw+cXfoUJO9Z8m5cNrjTujaKf5yKrHKOhhoNjQmZS rIUh81G3bNtjZlixgh5ukACzh1GF5Qdw2ijzO/cgwccCLsopIMP4Pz8N/BeXog8nS/g9 N1ytjQg+qGb4U4OglX5sWQmfeG0jE3of/i+iEqpYowSDTKUDkS8BgID86JpiG7hGP1px vd3udb9q7Z9C15yQBYz3q9JE7UNUD20XrqounC0ghA4YeBKTDWLu+5agQzVHMh34OC7b UsKA== 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=9PY8dbaD09Lv4B5/apSnbN+qpLesrLjy8w40ZkrsN1E=; b=KQQ+aFYezds5QL+VvjiiwV1k+pD2UlfEvpuaTrtlhkJsrjgnN47peGUQ02xuB8ygq2 ziOp4AXSqOpxPKY1snFIN7dwNU46ZbxreUw1GdyaAespodsRakxrPbx9oO5azJLP8Uon lsbLwRmw7c5aStuEEvq3djgdFSG6IagtvZy1wHRszF3OF7/OzHmjAYpe3X8mKKv6r/bI X6qxfLcipC7fQYAIKoyVg6UtIqeVT5Bl6zbheHblKfYbpJyibUJCzQAEcaS3YSLbtZOc tcMBzkx29qVD/s9be00GorU/ArnPo9XwvBSRPazm3SEoqdlq0us7AuwPqYONaA/PzxWF SKRg== X-Gm-Message-State: APjAAAW3jzfOAweWxLWF6yL7f9iWvz6KOaj3rputv6hvxaCI2spSN0vU l3ZMAZ68QJNrK76qrXGytPBrb7O/ X-Received: by 2002:a5d:528e:: with SMTP id c14mr77740200wrv.308.1577840354042; Tue, 31 Dec 2019 16:59:14 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id w17sm52431655wrt.89.2019.12.31.16.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 16:59:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 01:58:33 +0100 Message-Id: <20200101005837.11356-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> References: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/20] avformat/matroskaenc: Remove unused function parameter 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" X-TUID: w9LEAWVq81GZ Content-Length: 3879 end_ebml_master_crc32_preliminary() has a MatroskaMuxContext as parameter that isn't used at all. So remove it. Furthermore it doesn't close its dynamic buffer; it just uses the underlying buffer and therefore it only needs a pointer to the dynamic buffer, not a pointer to a pointer. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f9509129c8..c0979feb88 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -361,11 +361,11 @@ static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, /** * Complete ebml master without destroying the buffer, allowing for later updates */ -static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv, +static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext *dyn_cp, uint32_t id, int64_t *pos) { uint8_t *buf; - int size = avio_get_dyn_buf(*dyn_cp, &buf); + int size = avio_get_dyn_buf(dyn_cp, &buf); *pos = avio_tell(pb); @@ -1389,7 +1389,7 @@ static int mkv_write_tracks(AVFormatContext *s) } if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) - end_ebml_master_crc32_preliminary(pb, &mkv->tracks_bc, mkv, + end_ebml_master_crc32_preliminary(pb, mkv->tracks_bc, MATROSKA_ID_TRACKS, &mkv->tracks_pos); else end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS); @@ -1644,7 +1644,7 @@ static int mkv_write_tags(AVFormatContext *s) if (mkv->tags_bc) { if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) - end_ebml_master_crc32_preliminary(s->pb, &mkv->tags_bc, mkv, + end_ebml_master_crc32_preliminary(s->pb, mkv->tags_bc, MATROSKA_ID_TAGS, &mkv->tags_pos); else end_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); @@ -1881,7 +1881,7 @@ static int mkv_write_header(AVFormatContext *s) } } if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) - end_ebml_master_crc32_preliminary(s->pb, &mkv->info_bc, mkv, + end_ebml_master_crc32_preliminary(s->pb, mkv->info_bc, MATROSKA_ID_INFO, &mkv->info_pos); else end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO);