From patchwork Mon Apr 4 11:29:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35159 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1911554pzb; Mon, 4 Apr 2022 04:32:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+uMzDMMAXGy6MpMyH7FpPaJ5MfCx+P5lnwhjNDx9HocJMGAGtJJR6Xzl7hS+wmeHHiz7B X-Received: by 2002:a17:907:6e93:b0:6df:8c1a:d08b with SMTP id sh19-20020a1709076e9300b006df8c1ad08bmr10168462ejc.557.1649071970362; Mon, 04 Apr 2022 04:32:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649071970; cv=none; d=google.com; s=arc-20160816; b=kJZgrZkqbUHLMwwJgpPv7hG4MwHZxQ0dKRziTxOmfOzAH0gDSh+mSs7aL+xEJjIMrP L/U2H759AD2TysBbhWe8a6GQuGyA6uoVDwBOH/cSwBJDkYSsh6RDYzKuNVQtcvfRNgjg HkGGWQwrUtyVodJgt4AoVeHrgYzvTajlLTmgvbcyCeXyQLky9Rhbzqp0vvgwjMan8ReM n6NuO8CM0LL26l+ttIlG3JzMT6CWZ8x/JfPe3deD62Bcz+4qt0OMoHi1/Msr919X7agb IKNzsiJ+hfib7T89L/oDU4i4fYgjHu4QHoutNU1eN6OocYZoRSKGjIaYp2qI77lmGRZE neRA== 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=W4wQuv1e0QLLMMI8AdVk7Lp6cUYbx3qcgHfW7gFAwJk=; b=hmn0U/A/gAq63NfSJeWvk0xoy1AGHJIKIdcPqMq1Jp9ImmnTxwucHPCMVoaJ5//Xi9 teOr/8WxOmqsjUbcjemRuEaPJ3PXEiYEvGsfQxVr8xYme2hRIwwLvbkpOKcUgYuXE5uw GRftqhy3eiQj1G+8Vwtz1ZEBvQzvK8O+iKb3EY8oKC/k5tBARimJvJy8CATgQNERhOfu 4JtYn1WoK87rE9AK7g/Cl8zj3GouTPmmdexPOsskxZ9gz7AyXf0OX+AcA3aZ2xlnu6OG J3qhvXRCIwsMrvWimEQsD+NxrZcK2KdF7kMXOj5RBjx58pxkwa/mr0MvXSiHuO2hSBac w3Aw== 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 qh2-20020a170906eca200b006df76385e33si6098308ejb.723.2022.04.04.04.32.49; Mon, 04 Apr 2022 04:32: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 5883D68B211; Mon, 4 Apr 2022 14:32:25 +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 55D0968AEFE for ; Mon, 4 Apr 2022 14:32:17 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id DDC6424017E for ; Mon, 4 Apr 2022 13:32:16 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ncgRf68KEOXN for ; Mon, 4 Apr 2022 13:32:16 +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 A009724017C for ; Mon, 4 Apr 2022 13:32:14 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 9A0473A019B; Mon, 4 Apr 2022 13:32:11 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:29:49 +0200 Message-Id: <20220404113037.13070-2-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404113037.13070-1-anton@khirnov.net> References: <20220404113037.13070-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/49] fftools/ffmpeg: drop an obsolete hack X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Yuqv+TA5PISg Introduced in 05741d70c7a. All encoders should set the timestamps properly now, so it should never be necessary. --- fftools/ffmpeg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6d62bdc7b0..afa1b012a6 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1372,9 +1372,6 @@ static void do_video_out(OutputFile *of, av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); } - if (pkt->pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & AV_CODEC_CAP_DELAY)) - pkt->pts = ost->sync_opts; - av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); if (debug_ts) {