From patchwork Sat Mar 25 19:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp225417pzh; Sat, 25 Mar 2023 12:16:31 -0700 (PDT) X-Google-Smtp-Source: AKy350aY4SxxLkcV1dfPNxt9YF4xDP/1r+wARFVbKZtF4WNYcTLefNihvjtl66z20N2LHaPX7zeN X-Received: by 2002:aa7:de92:0:b0:4fb:fd22:29c0 with SMTP id j18-20020aa7de92000000b004fbfd2229c0mr6637026edv.26.1679771791734; Sat, 25 Mar 2023 12:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679771791; cv=none; d=google.com; s=arc-20160816; b=zgmGkOHkzTYX120VvQNxRtEbybyTH03CF4Zn77o5g7vKXpu9B4tdqBJvkgCiyalfjN cM1SRXxJRFQ+BgAMTL4gpqrl6mNIAknIF0EFBRqtak+uyoszk1q2VSMOq5w7T2v7tlL7 7p2XYpqKwOlyQKEAYcF7N65M+ifc1xn5LrmkX7QKAhG9SVBt7+UYe6O7erymjrFhRBLb GhtghZrbcOHgPDBE2sJFcl9c9QZCr0SP+N7bgQkMhgPA0SUjYwqZWOI6viqFqgjtDbsc XkppI/fin/qlL5haeOfvgQP52GytjY3H2yhRXuqvJXjuvTcHUfWKBcEsm8Eo9ynA9tVp eJCQ== 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=IlQSmfSzisBHd14zgVdkw420FKq9gKgvbscGY2ZW+c0=; b=aGx3tjJxOxdRIOXrMUA08+DL7TXRMYkGdcQb6PwIYnNBqM/4G9i9B86wzojZWIk6ex uu3Wnd9d91sa/eMISg9DehngmyrLdQ6TcgcdDCCtI8T+legPVY6nPIBDAMecvZvzXioE EF2B4cx65URkRfvGHNx1U5h/0h/4YenNwXggg2Yo/PbCtwgWFN+cl7Y9N9kcfEazIgTB LC77gucXkVBKMaz0Bm1KWRNJdO3IxUzt0nB3CtdIoIq9LKkl8E99PpJBmN6FQeygNHz0 9mFcjMBxLVq39zOqZ13OunLa6Vs7xg/HxrYEpVsPe8U7XtF3zN68DKQ7MzG+mZNEhlFs 3TJQ== 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 k16-20020a05640212d000b004acb7e10eb1si8353462edx.238.2023.03.25.12.16.31; Sat, 25 Mar 2023 12:16:31 -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 4F03868C915; Sat, 25 Mar 2023 21:16:11 +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 BEA1A68C810 for ; Sat, 25 Mar 2023 21:16:02 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7D2D82404F8 for ; Sat, 25 Mar 2023 20:16:02 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cVH5F1SBbGFU for ; Sat, 25 Mar 2023 20:16:00 +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 D8D2C2404EE for ; Sat, 25 Mar 2023 20:16:00 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6620F3A039B for ; Sat, 25 Mar 2023 20:15:54 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Mar 2023 20:15:08 +0100 Message-Id: <20230325191529.10578-2-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230325191529.10578-1-anton@khirnov.net> References: <20230325191529.10578-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/23] fftools/ffmpeg: move initializing next_[pd]ts to add_input_streams() 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: JhYE2LsA16AQ They are initialized to constants, so it makes most sense to do it as soon as possible. --- fftools/ffmpeg.c | 3 --- fftools/ffmpeg_demux.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index aa9284ecd5..abda713ddb 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2848,9 +2848,6 @@ static int init_input_stream(InputStream *ist, char *error, int error_len) assert_avoptions(ist->decoder_opts); } - ist->next_pts = AV_NOPTS_VALUE; - ist->next_dts = AV_NOPTS_VALUE; - return 0; } diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index db05ddb8e9..354d3165c9 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -675,6 +675,9 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) st->discard = AVDISCARD_ALL; ist->nb_samples = 0; ist->first_dts = AV_NOPTS_VALUE; + ist->next_pts = AV_NOPTS_VALUE; + ist->next_dts = AV_NOPTS_VALUE; + ds->min_pts = INT64_MAX; ds->max_pts = INT64_MIN;