From patchwork Sat Jul 23 14:09:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36900 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1046463pzb; Sat, 23 Jul 2022 07:10:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1veYwGNuHIM/qNcm0WIzOj8vRfqYj1ReutQ2vGAijMvNt4px729GNujHHZ2aX0f7C941mQo X-Received: by 2002:a17:906:cc5a:b0:72b:1459:6faa with SMTP id mm26-20020a170906cc5a00b0072b14596faamr3706833ejb.221.1658585431976; Sat, 23 Jul 2022 07:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658585431; cv=none; d=google.com; s=arc-20160816; b=o+5+1mYvBxQcAiPps8+EIrG5Wc3e9A3FXU0CAaO+PI7jtN3TgA78FuATGuJTU6ZxU3 UCSMGKxthX8lku5YRQ0e3QUbTNwQNn7iUsF4hfflZkcT36WhuRSqGmWJfEvTosgjj+xY lszz7fUK38aDTLQj1Apahi9kqTKRItEf0XC31W1f4U8qrSQXKBJ50T+PC4FSbZT4qhVx YgaFCGQZmJa+ytyD4hZ1CJk5Gp0sf6xlPRBIqkOGk6vrK2LKwv01h88vl0WLWky3fPfR GBoHmrA1FyQEcFRNnobD83zCY3ZjNUYe8DqT2zDmAD9SPqGfPhoCQr6ORSKM4c3tD+CW SmjA== 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:message-id:date:to:from :delivered-to; bh=35UeNxSzq5Nq56u7mlv0KFgyL0no5TXOcZIZzke0314=; b=XJFMJ/0adboNJUQPIc1Gp0OBOIfMsSuwoO/p9/K4AUJYTHzbyRrExgxpG2HwVXCAyv jOA+6cZ6Pq4KHq59BdP/l1SQ40tWO4sY+NqPoYOmUoJnZAkdabJPGpSHvqKYiOGg/68t YXuCzKMhhg9S/SKMfrk/fh1jcIFd5eWJ2ZL+Iarkut8msJJwx/cKb5RNQHrimJ2AM0HV jH3Mm+V7PXJg5HZnTOgKklKmTlHPu9ZnuwAe4Iw+Jx6F2Tw6XbMNGFDtJTSDjIebZ7rh Dlilnv3fdB5LEGQS526mWrDHBJZcK3Kj1EBae/CVlRiRvzx7sCp+bacdrrH8wt9vH7e3 i7kA== 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 hb10-20020a170907160a00b0072b394cb930si9201042ejc.784.2022.07.23.07.10.30; Sat, 23 Jul 2022 07:10: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 C035468B743; Sat, 23 Jul 2022 17:10:27 +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 27F1A68B704 for ; Sat, 23 Jul 2022 17:10:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 99F4A240691 for ; Sat, 23 Jul 2022 16:10:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ePAhN0afOWBu for ; Sat, 23 Jul 2022 16:10:19 +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 459672400F5 for ; Sat, 23 Jul 2022 16:10:19 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 51CE43A03A9; Sat, 23 Jul 2022 16:10:19 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 16:09:26 +0200 Message-Id: <20220723140952.31814-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/27] fftools/ffmpeg: replace AVFrame.pkt_duration with duration 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: 1vm5atlggWV4 Mistakenly reintroduced in 4740fea7ddf. --- fftools/ffmpeg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 632ac25cb2..841dd6f08a 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1216,18 +1216,18 @@ static void do_video_out(OutputFile *of, if (delta0 > 1.1) nb0_frames = llrintf(delta0 - 0.6); } - next_picture->pkt_duration = 1; + next_picture->duration = 1; break; case VSYNC_VFR: if (delta <= -0.6) nb_frames = 0; else if (delta > 0.6) ost->sync_opts = llrint(sync_ipts); - next_picture->pkt_duration = duration; + next_picture->duration = duration; break; case VSYNC_DROP: case VSYNC_PASSTHROUGH: - next_picture->pkt_duration = duration; + next_picture->duration = duration; ost->sync_opts = llrint(sync_ipts); break; default: