From patchwork Mon Jun 17 08:07:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alfred E. Heggestad" X-Patchwork-Id: 13586 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 B440A446EBD for ; Mon, 17 Jun 2019 11:07:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90A8368A326; Mon, 17 Jun 2019 11:07:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1DB06800D8 for ; Mon, 17 Jun 2019 11:07:32 +0300 (EEST) Received: by mail-ed1-f48.google.com with SMTP id k21so14857812edq.3 for ; Mon, 17 Jun 2019 01:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=3tHwzgGhvAMqZHnebCDSPzGYWiFtN1pvYlwgF4PekxE=; b=AX/kGQZabniJQCjQrMlS1SpzuPBPsMeLaxOHKRPzCKvk2fPOVSqo7FsN+2ev9Erti/ ciX5cMmuEG9yxhB4s9dI64WehMo22TPj5LFlsyxeSuLDjMQYlJ2bTUG13+IGM0IlpM2c 2wzOY7dJemhmlQCdtJGsUWO1NzMBuMfvkzxdJGuBENQTuhCRRKmO7+IVLxPnT15tsWG3 RRiMouQVRhJvosskLI+vyBO506arywqhvoUKblajIRCeWcA/ZcQEgV06mwuiUYoz6FDA Zx3hNeaYOleeCAYolZ3kOoolvmItYnsOtGuZAXt9Uf8I6fDDN5TykmW8GmFG2PkvdKCx M6Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=3tHwzgGhvAMqZHnebCDSPzGYWiFtN1pvYlwgF4PekxE=; b=aFOW+2YsyEkGWmlTnXpCK0qbxNoLg3IuDBpkJrCa/ubsiO/JnD3jL4D6DtBSiCQcZ+ wsjBA2XT16YyIWTCHyxJ028BVrTvOCjzX5b9kwGg40bNC5YFyIusDsjay9TEE14MicFb 0rafRjuzU8mB57Z+uGPHvCDkJOvce+1MMUp8ldb8YGFEHe1ytO2kCzBD3TQHi1XpH1kB vB8cNm9Ok+Gconyijz9rSf0Dv5yMAXSyVfmZuBqx5Wyd/7jpfPY9xavZQot6YV87q6KK j2ersUWbeNZkAVNesiDNOf5ZVWYHq/YU0WmRoj0Qhf9MiCT4LZwL9RTk+HdYGJHLnUUG lwhw== X-Gm-Message-State: APjAAAWu6t50oN174c2UIN8kInQ/NLUnFnfv5kO8DImEtPRvfXpTwLNR gq4NG5/Sx8k6FS1c2nwfKMvoRHOzl28= X-Google-Smtp-Source: APXvYqxe2nVnQcWh+SWJMg6NNBGHdHktjwqbq1DPEd7TQXOPBRUfhXJynJ3UM5tVSyPoTWRkE424bA== X-Received: by 2002:a17:906:3d69:: with SMTP id r9mr51355774ejf.28.1560758851856; Mon, 17 Jun 2019 01:07:31 -0700 (PDT) Received: from Alfreds-MacBook-Pro.local (d126-gw.mnsbone.net. [109.205.9.123]) by smtp.gmail.com with ESMTPSA id m3sm3361214edi.33.2019.06.17.01.07.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 01:07:31 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: "Alfred E. Heggestad" Message-ID: Date: Mon, 17 Jun 2019 10:07:29 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.7.1 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] movenc: calculate track_duration without packet duration 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From c69b63a7af5531257753754e64ac33b7ef530e75 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Mon, 17 Jun 2019 10:04:08 +0200 Subject: [PATCH] movenc: calculate track_duration without packet duration --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) if (pkt->pts == AV_NOPTS_VALUE) { diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 46d314ff17..fa5833962b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5486,7 +5486,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) "this case.\n", pkt->stream_index, pkt->dts); } - trk->track_duration = pkt->dts - trk->start_dts + pkt->duration; + trk->track_duration = pkt->dts - trk->start_dts; trk->last_sample_is_subtitle_end = 0;