From patchwork Wed Jan 1 00:58:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17096 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp217273qvb; Tue, 31 Dec 2019 16:59:57 -0800 (PST) X-Google-Smtp-Source: APXvYqxxnRL3IuErZfsygXrTCwAwJyIC0FWXXB3IV1BvCHYbM9ftlQgIdVl0leb/2grmapcwXSvK X-Received: by 2002:a17:906:c40d:: with SMTP id u13mr80751943ejz.178.1577840397896; Tue, 31 Dec 2019 16:59:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577840397; cv=none; d=google.com; s=arc-20160816; b=FvYFctrsBkkCrmaS2d9NbT0t4Hj9JzMnmfDb/urAD/jboMN+sHe+bUyIAE6qmwEfgP HUukBhHACtfg5K9SQ/Y5aJz5mJMdlW1Q/Oa68/5FIoJNmC9ckdTqcSLXRxT/zqqw7GFO B4mWCbYMdP3VDbtCeQSTXu9cCic+ikwe63+JxCMUAH/vKFC0xa46ZzbZ0zyZxGr4mwQ5 9dMc4BWxTma/PEVFB1HGxwCPYhZr2Rx8WsBrI0asL1nHtATO8oYvbfpNOVjsS5I8fU/W IWVEP2jHsdyTYKDa50QIF47Kd/6qzjBXVchzy9vCllLqyIF7vDqQlLTcePNVrByHT5Qo NZtQ== 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=IOYlkmLCawZNJxBQ5nJK1q7P8QyvQjzyn92+Ng8yx2A=; b=CtWPHyCLXbETBqHRfxXJvanc2TCnVqoGvtXEYwOVx8cn9v/OAYfWBsyAwOvg7jfK/t eu7WgW2SWDreaDayEGBuABwkCAaWKgI7xfUTErUMQpfBMCXp+VA11csb+02jsP9wY4ej x59D/jykQDBg4vgkHlXK/VXP+Nw4ANULBFVPz1lGlsE+/uibI3wNIiGNveXdw0uOJDja iVxwD2CzUheX9pqJ4ENN5qY/OxkD8rQOuhXih7ftEcAQY61xso1LDtpxBNr12HnjiYAV xp/A7kVKWSg/p/19tJj/EsOc646SRNyUJjdZEvJ87QGidvO5tdSrpFqdF3klLwn3KlWB KDkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VHrAVuOI; 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 v24si2507193edl.427.2019.12.31.16.59.57; Tue, 31 Dec 2019 16:59:57 -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=VHrAVuOI; 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 3556268AD93; Wed, 1 Jan 2020 02:59:15 +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 88D7168AD25 for ; Wed, 1 Jan 2020 02:59:10 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id z3so36239194wru.3 for ; Tue, 31 Dec 2019 16:59:10 -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=BAaOXqwIuwMmU0XNJH63ODl96QA/74OCOcIUY7ISELg=; b=VHrAVuOImFBrXXwCbeIpDzNVIjGJIJ34iuxVXGjkKwXgv4JpZjCm33eGcnfR+QZcVf 5rDuoWsuNDu8lIib5SJ5MLNt4uNU7AchuDkomTSEcv5LRyVeMy04j1UHHwOWjsDEynTc RLBHr/LcVEfrboaTuoFBg4NbU4aUrpB4sVg+1zFIluwCOPmzGu2mbFL26+I2oSOlaNpr umI3XTxrwrzd5FBeK2JgZeUI/8ooIu5uPXmDcUf8jtLtjBVq6uuT7s+zIQQo/h26sD5k LNwZrVzi36SQON7QX2hwoWrl/4BTGhMIfZsH889f3+PFkJ9NYutXAF5X3CMQvajWXTi1 T0xA== 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=BAaOXqwIuwMmU0XNJH63ODl96QA/74OCOcIUY7ISELg=; b=HlFGgrhM1fEquYoEerp56GXb6tkwaQJijFftasIjIOKdGk6I0OdCZ/NpsICGFDQCrA ZfkP/6n4Xq3KhdEYxIRyqtYnJeVMnn91QTa5xFDPaIOYtDB8IZDkFKU9zYliqTTQhsQA Gr9n39ChRT8QqLFerSxEiosFm7ACpEVDfyIVTNaSTXyyT2h9jdeJZqv8ob7wTDUsY3T+ StKhH5QMYiIQ3GquW4zJDP/N0lucnSpTOz8N2z58ew4xlDaQ+D5BlS43wVOqYw9Irw78 FwOxbSu/a492OqmHE+ceStX+wWsBXloDOnDBAxWSEVItMVVnfxAc+g4G+efCpe+BB+I7 ivhg== X-Gm-Message-State: APjAAAXVxST5+Ukpx0np5ZfSJsnIxAHQdQh4A9Lq/hkRXOEyIYbjHO8N DKFceEhcKWqXEWxhZdbPqLCEqAKh X-Received: by 2002:a5d:5452:: with SMTP id w18mr59679892wrv.333.1577840349738; Tue, 31 Dec 2019 16:59:09 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 16:59:09 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 01:58:28 +0100 Message-Id: <20200101005837.11356-12-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 11/20] avformat/matroskaenc: Cosmetics 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: BMAgs3uwxanR Content-Length: 2379 Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 8040c8311c..6dd731eb90 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -449,7 +449,6 @@ static int mkv_write_seekhead(AVIOContext *pb, MatroskaMuxContext *mkv, { AVIOContext *dyn_cp; mkv_seekhead *seekhead = &mkv->seekhead; - ebml_master seekentry; int64_t remaining, ret64; int i, ret; @@ -465,8 +464,8 @@ static int mkv_write_seekhead(AVIOContext *pb, MatroskaMuxContext *mkv, for (i = 0; i < seekhead->num_entries; i++) { mkv_seekhead_entry *entry = &seekhead->entries[i]; - - seekentry = start_ebml_master(dyn_cp, MATROSKA_ID_SEEKENTRY, MAX_SEEKENTRY_SIZE); + ebml_master seekentry = start_ebml_master(dyn_cp, MATROSKA_ID_SEEKENTRY, + MAX_SEEKENTRY_SIZE); put_ebml_id(dyn_cp, MATROSKA_ID_SEEKID); put_ebml_num(dyn_cp, ebml_id_size(entry->elementid), 0); @@ -478,7 +477,7 @@ static int mkv_write_seekhead(AVIOContext *pb, MatroskaMuxContext *mkv, end_ebml_master_crc32(pb, &dyn_cp, mkv); remaining = seekhead->filepos + seekhead->reserved_size - avio_tell(pb); - put_ebml_void(pb, remaining); + put_ebml_void(pb, remaining); seek: if ((ret64 = avio_seek(pb, destpos, SEEK_SET)) < 0)