From patchwork Wed Jan 1 00:58: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: 17083 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp219864qvb; Tue, 31 Dec 2019 17:01:39 -0800 (PST) X-Google-Smtp-Source: APXvYqzv7hLEu0eW10PX83R69J35i0RAyROs3EQYqd43+XtiSXvOuRFeL0oqojfQiRp/3NuQPoZT X-Received: by 2002:aa7:c389:: with SMTP id k9mr79075101edq.63.1577840499190; Tue, 31 Dec 2019 17:01:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577840499; cv=none; d=google.com; s=arc-20160816; b=lBizE3lWyJZWzvd3Mz2wAeLlM9uWtrcJ3WTPPkBwXxXbYEyE7+/x9jrlSnh2v3Hkan fW7ud6i3tJJsol1y0THF7FI4Z6G9YgGWo44BLotIy03CPtX4vvvTfbYvS7YaptECWRdU AnIQy2FQeuO1HG0SXqFO/X/VXDmhjr8Kdlsxi3JcuMf2F2pDcy7MXURpZw6tIm6RysbM sRKtTHXZd+jjVTwPfLXbah2slNHU6KPIAphcMn1V7Ech4gfRVSaLwvjdnuaWcBVouAEE G0o9UIv6BATyw78AxZ76l4/1bn3GWFOilVvBwwGWbafhZq6uCVj9jKvWDUZtRX8DCX4B 6ISg== 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=oiu9whldDfxyWlOFJPwKXs8jfGcaxlUbD6gIHIBXaIc=; b=sIJM/GV53whFBfNwRf41rCCYU1MxU7C+WMinPowCijQvmKdwRSNY9+3NEqbrzJ+IVQ JY8ypTaZvjsPXrsDuGFs7pr9sbrigWhY+nB/akIDsKExZdrovbPaYWQqTHpQ52VTxG/R CrxQuEEV/oQbFdqYpP13OXZeQh7wpy2YyaUBfusve6EnXqyNoWjhXAYEJhORhZG5o5YD VgvQggzIwpkJHKDh+VvFi3M+fY2o80KRY5mGu8wHgGYhFdYgqaREBbLrpmCx/Uunx/ku fcPuo1PL0m3dI8TsVcuCfB9USriqvZpfIcw00J7oCrb+Q7h/lkE5FrbFYtgKGIZDPRV6 MlWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=h375hcJZ; 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 i8si22352312edv.38.2019.12.31.17.01.38; Tue, 31 Dec 2019 17:01:39 -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=h375hcJZ; 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 09CF468AE4E; Wed, 1 Jan 2020 02:59:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3086168AD2B for ; Wed, 1 Jan 2020 02:59:15 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id b6so36270354wrq.0 for ; Tue, 31 Dec 2019 16:59:15 -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=2Mhh32fFEsWZXpXNvlTJ8OIoSwn+hrvJLYK5c+ottEc=; b=h375hcJZ46jPqdKAR7cIPWZSdb5+SS3E9LHX+TTiKgwWwBKX4RVJajy2rZJMKaYKw+ DDuXZ1uYnUKOevfjlUTeC3J4jf7CW+GGuMixxtGQ3JqZbRggUqC7eqkVMuIVIy07RlgR SCxxbn1eyAodPrBwNtVKOcSyoSiNY1vne+JoRn5G3Nys0Yuws3Iqx1dUqKguCsFLPQ0h TFr13Urq9yDIGKzU9qDds5l1TwKkMu3EsW8VV5CJJEnQGUyGH+Bl4cNmEYXRwI1GqoF8 73MHwrEfd1DRgZx3/oM0NO4QWFBIaWk7Vd7Q2X4FebJK38Wam9qomw+2DJXlhOcokdE7 EGnQ== 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=2Mhh32fFEsWZXpXNvlTJ8OIoSwn+hrvJLYK5c+ottEc=; b=gZnW2fQc/6Fac5jDGMTdmBbiURT2rupf3m1/7MNuIIvZwMpfjZQwyRxKcoOvar8FRe cvkh/jQKrR+p/YdFv/NJlBoxp4kb/evVJ5tJxmcfRZ5UAptzOh0/+iFDuWmgKYhFQ6iI mBqQBvLJ68TM7zBXYl8n1CgtuHbxvVjpORDWCPTAwCkD2HOhejk2GFohIzwUjw7XTIc8 qqPh0+ujSF6Z1Da3wVA1dDiMIHZbsXqywauQ9mp6ehhABm/4CBVUU9QqdQal8OnVz/g9 j476AyyN4dBSbzb1iowrVQsoUAoo7o1R8HKMO2oU00NWYr/+i07vILaUH4+tWCGsihzE J1Ag== X-Gm-Message-State: APjAAAXAjl0LmEdYgUBN1kjJHqgzMO86njmyMaVmZCJR6McdDSbFFUoY qybIXmVxuvl8Uh0cySkNtu75cMjb X-Received: by 2002:a5d:6144:: with SMTP id y4mr75910633wrt.367.1577840354784; 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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 16:59:14 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 01:58:34 +0100 Message-Id: <20200101005837.11356-18-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 17/20] avformat/matroskaenc: Check that Cluster has been opened 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: p7X/amx0YlYe Content-Length: 1569 before setting the field indicating that a Cluster has been opened. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c0979feb88..d7aa832eb3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2306,10 +2306,10 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ } if (mkv->cluster_pos == -1) { - mkv->cluster_pos = avio_tell(s->pb); ret = start_ebml_master_crc32(&mkv->cluster_bc, mkv); if (ret < 0) return ret; + mkv->cluster_pos = avio_tell(s->pb); put_ebml_uint(mkv->cluster_bc, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts)); mkv->cluster_pts = FFMAX(0, ts); av_log(s, AV_LOG_DEBUG,