From patchwork Thu Jun 21 05:40:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Kohm X-Patchwork-Id: 9454 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1586263jad; Wed, 20 Jun 2018 22:40:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJnrgFjys33k/eG6EP/YPYYEP6614DwZWEUyWekNp7rbcsbfyE58IId038UmSxpWYFt761a X-Received: by 2002:adf:9a2e:: with SMTP id z43-v6mr3590232wrb.47.1529559645640; Wed, 20 Jun 2018 22:40:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529559645; cv=none; d=google.com; s=arc-20160816; b=VvSWfu4AzfIU9OgVUtJVcNZn3jnJbmbW9vj7C7O9iAgxZ65pGTJHW4ltJVHWPfxqAb J4GL2EDAvQoN8tOUvUOS+DriEup6P5koQEmJh09FqL0oTVUGBZQ2y4qRgss0yDqcOJx2 gRUZSytxWwOPpKYLD4ldewiVab4N8lgBmfPG5XbqspyT84lvJ2FrfiAwSsduchyu74f4 lsZZ6lV+Dl+ct7lzxotLhlOYMdaLymvNbleHSXeXZhZ1jr22vHWGpukMkIATglWzFKZt /mnpZ0vHbzWweuNXj75oQOK+Zg5IlFcSIIAu1nmisSBYh2/AEE550RYKj1FD5aLLGOc/ ktRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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 :delivered-to:arc-authentication-results; bh=4m2CHaxKb58Ee3yjI16WqMQ7iLQqlIsIUBtbIwIVubI=; b=JyfCZ0iZwq+m+Ghz8fZBbRjPqI5/YP2R+E6i4A7OPgpKCreJEz8SOVoMKj3ZjAu0B4 HJ5sJhMB8zyJLsw7Vg6J106RyEWKU8/HSOMUSwlttSjYhGRH9LO43PbEqexhWp78i4KH /EP812cuOFbO9FqQ6aIQa+T6S//2BxWE3Oa3co1Up4oGxy8N6tbkJHKI/J2MaTBkVh99 +HB53brE7UbCD52bwTuD23fti6HXDjnPhj8cZjJBivyoIYUDQkExJYKeI+0enjpOs9SX 5/jfY+pxzEtVMQrjiV8qoeYaOIqSMxfVjsQzOLFq22bkmgeL2MbIhYJKCyXlnHe5qnc2 IfWQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p137-v6si1277944wme.25.2018.06.20.22.40.26; Wed, 20 Jun 2018 22:40:45 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F0EC68A592; Thu, 21 Jun 2018 08:39:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44B6A68A559 for ; Thu, 21 Jun 2018 08:39:24 +0300 (EEST) Received: from x61s.fritz.box ([87.122.237.100]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MUCTO-1fe9ml0nly-00R1tA for ; Thu, 21 Jun 2018 07:40:17 +0200 From: Markus Kohm To: FFmpeg development discussions and patches Date: Thu, 21 Jun 2018 07:40:10 +0200 Message-ID: <3139027.gUWHTmZQCl@komascript.de> X-Face: &j9&UV)xci&*\>K%lnE]u/`\0'`-rm=~HHx|j|3.iu}_m>N*Bu~=@/_5<=!?65%4BgW]f( In-Reply-To: <20180620205434.GM4859@michaelspb> References: <22848661.ktHMkvvdCD@komascript.de> <20180620205434.GM4859@michaelspb> MIME-Version: 1.0 X-Provags-ID: V03:K1:tziynJMBMivHLOrbLcTc+rt4wyOf8gTdDFznAGoaGUjss5y+/u6 dmVMJoMgzuwcxjRrBthA3Dc23k1VE8xA06wabHsvZf3R+8Sbd+zoRAAFDMxsliaM0JGFFU+ RxMhpc1R6lnmfrqI5Efc/OmtJHG0JK57HlrwoVnmaYQonwTUNbdA5De3DZm0oKZK5qgoIzu sX4gwPqrAP9aURrkiu2sA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Vk6YWBQMaHw=:veC66w2lzFN6WPmryAtbCx jNUzanZE6AOsmw/uram5HoyymKEwsum83l4Fto4x7s1CvD68eD9XjLLULqjlcUJVOzexbAdaU duT0TCaPud0TXdPPv1cIhCNsd7aHvjk66jYk7qH95t57cw30ENeRVYG+xnCWL6gWQKcm3EdNv BU63+eAHGreIV/TXqon6gb2gcvuQmbg1osRX/3zvy4ELkL1XoL4bWBGQ1clpzacrXX3kJu1LJ 6AhrU2k221kfs/Pk6sbn+eVqoin4P9dls8Gu7gk7Cl28g5BxcKJNzrpf2zcXwgxUsiQ05pQmi emv0RzGihliOS7u3bfMduRewbRVItecc2UIO3hBT9vpfmnsDYV3TLIBwGFongyfsQqkVEyKax /fgc/aF0BCav6kX8m1p7EZK49lLiOKBW+Q+ETSGhQmJYmmCW3Ag58+OhHgz8IVrw7wAQqthXh ZqIDIGVOzlzkVZvbKsOSv9YhLxxy24II8teJR9Zea7uXdQAkEV6qKDi2MRctkoNNTdxkBglxt MFBrTeU4aAk0fSb1WLTZHhYVt8lPlGwSQrN8JdMhKNHrqzcMnWNo4q1aRtAGhqSHubSL3Z4iS 2NQwTIc31pu5sC1xaCshRuI01JJJAKvTWImOSmPWa5w/D6DmFgWPd5JQE6PG331O4pmGG/dzG hGjTieoeF4Ti8/Ffj8HsQo3mgSKUBfQENP+bot/e0L1pput2hik+/hBrXvWApQmCATVv7WyuA aNz07O0hOR56VfsCs+HFShI9fJhaKfsYUR+lWrrvBdtRfmUN0fYXsAMmGbs= Subject: Re: [FFmpeg-devel] ffmpeg patch for nonmonolithic increase dts error in subtitle 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" Am Mittwoch, 20. Juni 2018, 22:54:34 CEST schrieb Michael Niedermayer: > Please post a git compatible patch see attachtment diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6dfab64bc7..8d311a9ac8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -772,7 +772,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u - FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1) - FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1); } - if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && + if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) && pkt->dts != AV_NOPTS_VALUE && !(st->codecpar->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) && ost->last_mux_dts != AV_NOPTS_VALUE) {