From patchwork Sat Nov 26 08:19:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6013590pzb; Sat, 26 Nov 2022 00:21:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf5cn0pW3SJgAr8htdb8+WpxtoXaABY/aTbICs+hJiSV9ZAP70lu9ore4kmLsixZNph+WAeE X-Received: by 2002:a17:906:2810:b0:7b2:7b45:2bf6 with SMTP id r16-20020a170906281000b007b27b452bf6mr19551213ejc.467.1669450872516; Sat, 26 Nov 2022 00:21:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669450872; cv=none; d=google.com; s=arc-20160816; b=HxMK1ox0Tsp4RbJi9BnPj7DvGmLHJHWsjJplMLPMVnK1n2gQEnmWf3qyZ1XyL/UDtT E+m21hmkCwrDJeqGyqC7wrOkLcRDgkMfRHU1/97Awrt+7BAa/iByVH8NAZP16WTk3K0p qm90TZfF1EMqz/JLBxU314Tikqifte3XGvHQLVARlRKhtcCEE5hLVk1bfHjhCyG8L5jt tTKizpSPzFeXEmPdWVnn3QhXsS7RV+R5t5vk15XRWJ0xY9SzhK5MLHs6poT1QC4FLzSW oO637mJC+YU1dJS8dLdXRDFF1L1rXNFdR1/+mCdCUctw4n+wPqtfGTPjQFa7K7md6iJK YjdQ== 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=OlwYQmKi4+mKNPI2fLZBP8VZfpU/s7vvIFckHtnSfDA=; b=D2Yh3wp2spRF7UDkg6LZwoqXIy7QnxxFjqDDhX+OfUx8QeEC40ezUQ1t4/oLAJbzwn IFXmK8XAgUJFtHZC9Q2LLW5Y4P70QXLpuj5KNtRUplrUfGZgd3ywH/O576CwS+O8i4MU nvk7jXvlnXJFsbB/Xe7G/qcNBPUyDlvx8zumAk0ydCmnT3So5JCnS81LcgtzhaHJ7cZw dcWg/DgnKor1y8Bd6IfFRExSGDsYmgYzrkk8awS60Lg1veST0dxxQytWXlIxOPKZB9ud E6sCNpNAj+3MigzBEAhqQ0AfPccJTBWEiUysi08nAE6lP2HAHw57zX4y8iB9iPXkRK8M BSvA== 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 z63-20020a509e45000000b0045c9904fdafsi5248716ede.74.2022.11.26.00.21.12; Sat, 26 Nov 2022 00:21:12 -0800 (PST) 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 2F56968BAC7; Sat, 26 Nov 2022 10:19:42 +0200 (EET) 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 82FD468B929 for ; Sat, 26 Nov 2022 10:19:30 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 296AD2406CD for ; Sat, 26 Nov 2022 09:19:28 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Dx4T3Y0bGC32 for ; Sat, 26 Nov 2022 09:19:27 +0100 (CET) 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 CC20B2406CC for ; Sat, 26 Nov 2022 09:19:23 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BE6C73A05A8 for ; Sat, 26 Nov 2022 09:19:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 09:19:09 +0100 Message-Id: <20221126081911.31275-11-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221126081911.31275-1-anton@khirnov.net> References: <20221126081911.31275-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/13] fftools/ffmpeg: drop an always-false check 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: C1U7XMAISgL1 --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 8f27b5ca3f..0128476f57 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -678,7 +678,7 @@ static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost, double float_pts = AV_NOPTS_VALUE; // this is identical to frame.pts but with higher precision AVCodecContext *enc = ost->enc_ctx; AVRational filter_tb = (AVRational){ -1, -1 }; - if (frame->pts == AV_NOPTS_VALUE || !enc) + if (frame->pts == AV_NOPTS_VALUE) goto early_exit; {