From patchwork Tue Apr 2 13:32:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 12575 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 2CCDA447FF3 for ; Tue, 2 Apr 2019 16:35:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14A3C68AC75; Tue, 2 Apr 2019 16:35:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 572B668AC73 for ; Tue, 2 Apr 2019 16:35:03 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id q1so16714738wrp.0 for ; Tue, 02 Apr 2019 06:35:03 -0700 (PDT) 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=6uNWTujbH9IoPqkynVzflUIZH3HpwObsmbTWi5SqZgg=; b=B1uA8LULJMrngeDbgmt7fNZfyZyhkkiZULiwFUAIPGd9ySNOgZqVjjhDVF3jgwc35M 5d/ve/KenhTJMZLJw8knpZcZv2RtGHeomibAKeEB2WFKD4wnjfRc3EA+vH73yFScvCui nET6r40NVNFmGyX7jbqEHrhv1+KaTWevhWCNGch5Qt31Jz8rljEG4yqoBbYSQTyMHXIp 9R3O8EM3xhrTCZqc3yrrhx6ed5h+4aWA23Nrlc5/DIQNUT2vUuNKrGmHKSQs8IWyrtWX vb/HW2mo7oVNe8gAzBlMgX8vDnc3DUgRbchwfFyQeJQ8cUnJQjkAPotsRi0TGP/xGQaD XECg== X-Gm-Message-State: APjAAAVr7XWqsAbv9eZ/D5aO6cVRgEU9EuHcQxQIJGcwJvZX7ETVggU+ Me5z84criS1nUWcIFRL3X213kZ1y X-Google-Smtp-Source: APXvYqyOT0i6ErpUa33/53eroDju7jtgkdbF77svXMogIlNRsSkGthmNRjLYkOypzNbji2Fu05f/3w== X-Received: by 2002:a05:6000:2:: with SMTP id h2mr6563911wrx.76.1554212102693; Tue, 02 Apr 2019 06:35:02 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id t24sm15566886wmi.10.2019.04.02.06.35.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 06:35:02 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 15:32:51 +0200 Message-Id: <20190402133305.3328-2-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/15] avformat/matroskaenc: Fix relative timestamp check 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" At this point, ts already includes the ts_offset so that the relative time written with the cluster is already given by ts - mkv->cluster_pts. It is this number that needs to fit into an int16_t. 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 b9f99c4463..394109ffe3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2402,7 +2402,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ ts += mkv->tracks[pkt->stream_index].ts_offset; if (mkv->cluster_pos != -1) { - int64_t cluster_time = ts - mkv->cluster_pts + mkv->tracks[pkt->stream_index].ts_offset; + int64_t cluster_time = ts - mkv->cluster_pts; if ((int16_t)cluster_time != cluster_time) { av_log(s, AV_LOG_WARNING, "Starting new cluster due to timestamp\n"); mkv_start_new_cluster(s, pkt);