Message ID | 20230419195243.2974-7-anton@khirnov.net |
---|---|
State | Accepted |
Commit | d8bc37f1f446d5798d77830e197f02188919a313 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp743878pzb; Wed, 19 Apr 2023 12:53:51 -0700 (PDT) X-Google-Smtp-Source: AKy350bNKK0yUxbFTDgpx8k6muo6+nkZBDq6xeVTnzGPT1BciN9GkIR9vXdNCedObWEz6l+VfuI5 X-Received: by 2002:a05:6402:5141:b0:506:7f78:c4d3 with SMTP id n1-20020a056402514100b005067f78c4d3mr6298849edd.27.1681934031011; Wed, 19 Apr 2023 12:53:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681934030; cv=none; d=google.com; s=arc-20160816; b=y2L644OB04brIbiK3JLRrQN5cZdSGSpJ4I797k4xgr343/IgLNGrX30bvSaSi5HBeV 2OOYfvAKbZggWrlYEwr6teahpe8rqMDwefgFD6iz5u7eYlo4DvjYFleHnKR7PEke4ijV ZAESgZssrCBwwfGQ6K8Bb4CsBzkzHOhyxs9C0jIc1v2YNpGAA3zYjpwXD9NQaWvLNWqi T3U67RXudVu9QRJDvfqwn+WMysdXeT6NE130z+z1MyQHjzZPYn4UUDY9dcD3nFjcMWs0 dcc6pIqRMEQS/b4UQqN5Unc0pwXN/8g+qJL+mgyzF0KQ7Legz4er6t3Yhc5Nm/ppK0Hy PwpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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; bh=oKpLrpGzZwxjI3/qbEjo1Pa/B46X7MbHuBbszVBXB0Q=; b=IAxSkQOe6/sMxjc2MMDrnVOIuWVd1RWXPe0oI9AZR4J/+yI0+MfBCsGZk83dbg2z0h aAsAJCrI8LYGQ3Y1s0v+Th4E2qqNT5KMZgI7d0FuYwLKtHkHyChhRtuEJ236hFA4+WRF AOXsZmn7DyQIYYyhohmDVmIkqE8qlW5g7J+0trWz2IX48Qg+fc2dz5OdaCrM7GSfA2xY /yJrpVAcroPoW4jG/d+fuklbOWgDH4NARDrSS3j9lMWKgeljipm+1Y4DmqKn5leHLO5R V3KeIVG/fjWqS4DHRIswEH0hTevCiZz+mOAXJCLfodx0hDcdjwhjqxxnClMnAPUM4/zy WG3g== 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a14-20020aa7cf0e000000b005069701844asi9726109edy.408.2023.04.19.12.53.50; Wed, 19 Apr 2023 12:53:50 -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 376AC68BF1E; Wed, 19 Apr 2023 22:53:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A5FF68BE41 for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Apr 2023 22:53:04 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E4ABE2404EC for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Apr 2023 21:53:03 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id QSmS86dmYxEY for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Apr 2023 21:53:03 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 624942406D0 for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Apr 2023 21:52:56 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 989D53A0E28 for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Apr 2023 21:52:55 +0200 (CEST) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Apr 2023 21:52:25 +0200 Message-Id: <20230419195243.2974-7-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230419195243.2974-1-anton@khirnov.net> References: <20230419195243.2974-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/25] fftools/ffmpeg: stop using InputStream.pts in ts_discontinuity_detect() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: okQxjlV1haZf |
Series |
[FFmpeg-devel,01/25] fftools/ffmpeg_filter: drop write-only FilterGraph.reconfiguration
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a7e856e9e2..cc087ea7de 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2121,7 +2121,7 @@ static void ts_discontinuity_detect(InputFile *ifile, InputStream *ist, int64_t delta = pkt_dts - ist->next_dts; if (fmt_is_discont) { if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || - pkt_dts + AV_TIME_BASE/10 < FFMAX(ist->pts, ist->dts)) { + pkt_dts + AV_TIME_BASE/10 < ist->dts) { ifile->ts_offset_discont -= delta; av_log(NULL, AV_LOG_WARNING, "timestamp discontinuity for stream #%d:%d "