From patchwork Wed Sep 28 09:55: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: 38410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp93548pzh; Wed, 28 Sep 2022 02:58:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6MZEuw0fGC0tckfWnGgjP44nvOnEedfChHfSzd89TFlVh9ZH5gcO7iZ3sEN3NRxHZu3SHM X-Received: by 2002:a17:906:6a24:b0:782:5c86:3589 with SMTP id qw36-20020a1709066a2400b007825c863589mr25730617ejc.747.1664359092888; Wed, 28 Sep 2022 02:58:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664359092; cv=none; d=google.com; s=arc-20160816; b=A2coTWu0Actfhfu/tLwldS20MEKnFcWijAQvS0gxFvQsgVYD5HF9er7NiWV94dpNYJ w+SutV7GZlpQuAqm5pE63VPigEtkAYvnEYOwUxkJrRWJhkz2KAg93V8FshHL7SAhedk8 fmh1b2EcSDCZg66dQNtCSbAM7KdvAgcX4yC1W+gnMlR+hNH4tbcU5sbvCfGwOa1QgixV 6fIDjvkcDeifTmQMCJrWxKHFeorl/6UinzNirt1eVczySB0Bm0PRh6AGuyeMQQW3Q1fL kKXD2rnMWEqLv4MxuiYkLrNSFLQOQ+BGDbAfkZ7ET+Sh0FMrUigA+R1l4VfLgRn4p8eh wuTA== 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=aXhMe7TW8NkITfrB+ted5PCwk+ucB3YUqtB+HqJtQpQ=; b=JFsa4sulRl+P20j1Svv6qe3KmMlhAlHLs8l0A4XK0XOsfUsP979J4pZzzaHX2uO/cr HayZq00KCUzE2faPiEYnvmNEPHdi5Dac1extXq15GI1XfjnNleX9fxx/oZdvKnl6DqFQ wNHd+8eDWs15T3Y3wSLI59C3JZsXjiktPWwzRyMthKpj3cByBZbEXo9b1RKX3Y+nIA9U U14kZZW+MJ9PTK3DngQj56dWkWSJ5uc++fr/OGpMw4dGu70GgWN31cxbFFcRxAKnYVzc 6GMP8YKAvcX7lAioaSx8iLlwQ9KJjf4WA2NtWc2BZxpmDH7AymqHUL2QDRk80WQo5GHo c28A== 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 g19-20020a1709065d1300b007313314bb73si4656428ejt.806.2022.09.28.02.58.11; Wed, 28 Sep 2022 02:58:12 -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 C949968BBEB; Wed, 28 Sep 2022 12:58:08 +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 35C6868BBD8 for ; Wed, 28 Sep 2022 12:58:02 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 74B072406C7 for ; Wed, 28 Sep 2022 11:58:01 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id azqoVDpcszBK for ; Wed, 28 Sep 2022 11:58:01 +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 F13FD240183 for ; Wed, 28 Sep 2022 11:58:00 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 3687C3A0520 for ; Wed, 28 Sep 2022 11:58:01 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 11:55:49 +0200 Message-Id: <20220928095556.28209-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928095556.28209-1-anton@khirnov.net> References: <20220928095556.28209-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] fftools/ffmpeg: drop always-true conditions 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: E9AbIMi9+W4h in_picture->pts cannot be AV_NOPTS_VALUE, as it is set to ost->sync_opts a few lines above. ost->sync_opts is never AV_NOPTS_VALUE. --- fftools/ffmpeg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index f84701ec75..2054271c82 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1291,12 +1291,10 @@ static void do_video_out(OutputFile *of, in_picture->quality = enc->global_quality; in_picture->pict_type = 0; - if (ost->forced_kf_ref_pts == AV_NOPTS_VALUE && - in_picture->pts != AV_NOPTS_VALUE) + if (ost->forced_kf_ref_pts == AV_NOPTS_VALUE) ost->forced_kf_ref_pts = in_picture->pts; - pts_time = in_picture->pts != AV_NOPTS_VALUE ? - (in_picture->pts - ost->forced_kf_ref_pts) * av_q2d(enc->time_base) : NAN; + pts_time = (in_picture->pts - ost->forced_kf_ref_pts) * av_q2d(enc->time_base); if (ost->forced_kf_index < ost->forced_kf_count && in_picture->pts >= ost->forced_kf_pts[ost->forced_kf_index]) { ost->forced_kf_index++;