From patchwork Wed Apr 19 19:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp743528pzb; Wed, 19 Apr 2023 12:53:05 -0700 (PDT) X-Google-Smtp-Source: AKy350ZIiIBqQkS3aXONxSTuqnsgWQ0PbsRoIo5++SoQFDIb7DQF0iayoCIuquWUn7xxKDx8jroV X-Received: by 2002:a17:906:3753:b0:94f:432f:243f with SMTP id e19-20020a170906375300b0094f432f243fmr12210559ejc.13.1681933985138; Wed, 19 Apr 2023 12:53:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681933985; cv=none; d=google.com; s=arc-20160816; b=SwU4kUzGGi6QGpli1hjvE9sHlj2UOYWrHHX7ywJ6FTMyanXO1sb0vTJLOFME6Kk5o3 de6zaZPYjSmOtjYFgoMcQKxl8n9RvKYicTE99DNlOOkMWG5zbWK7eKqm9RNFvAdl+WQ7 K7cb027K5NUqLz+1SzyQs9Yh9mpdHv2uHSdOUrJBPjl97dTzZQ6xPFhdcjcsVjBxd58+ A8sCBbl4v6Hgf/bYA0Aeg8lrPx7/BsGXFfwfFpjY14sMeOFgwh3vHYvcOLR5Yj+mZri9 gomFPaPLcrCIsFGLnculTdZ3UqiH9vLZSn+KS/DbXKh02DToKg9khWQdccAaBE29aHqt f61A== 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=+FhGgOiglULDvDlX073ih+5AqnVTRckc9ytwS9/P0jg=; b=0zQ6qMIYvqriMnLIvE9DXElIsfP44q9HCcz9Murlzs2dpUCsLRegpN72DBFF8LN2HV ZovQ+iEb+5mbDrHXuaWel+eGHoNEH6TaYUVc1iMsp5SCiEsvI6dNBobecp1z3R25FEE8 Y2Xn6O2M/Zci213iQ6xQ6v2AehOt46T62OzKbNzetMnxVByRGif/Y+6KPS6BP4VUvMV1 EZqV7dDooYlFIr3lKjp1RZubNZxYjMT7TBLRNYRO+g4g20IDQ9zzaGcTqSFa61WoUqr7 C2DiEAy9smqqI9ySesOs5sSmqQRvGH7reh0nYb48m+bcu9nOONZqIqJQNovh74r5C0lf gKwg== 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 c1-20020aa7c981000000b0050670df5fdbsi16326760edt.434.2023.04.19.12.53.04; Wed, 19 Apr 2023 12:53:05 -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 74BBC68BE67; Wed, 19 Apr 2023 22:53:02 +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 96DDA68BE56 for ; Wed, 19 Apr 2023 22:52:56 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 469C02406CF for ; Wed, 19 Apr 2023 21:52:56 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id k_j-m_DtvkgU for ; Wed, 19 Apr 2023 21:52:55 +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 CDA772404EE for ; Wed, 19 Apr 2023 21:52:55 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6A9EF3A07C2 for ; Wed, 19 Apr 2023 21:52:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Apr 2023 21:52:21 +0200 Message-Id: <20230419195243.2974-3-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230419195243.2974-1-anton@khirnov.net> References: <20230419195243.2974-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/25] lavfi/avf_concat: rescale frame durations 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: 2r1IQ3zBm2DR --- libavfilter/avf_concat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index c85c17b51f..af758c5292 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -179,6 +179,7 @@ static int push_frame(AVFilterContext *ctx, unsigned in_no, AVFrame *buf) struct concat_in *in = &cat->in[in_no]; buf->pts = av_rescale_q(buf->pts, inlink->time_base, outlink->time_base); + buf->duration = av_rescale_q(buf->duration, inlink->time_base, outlink->time_base); in->pts = buf->pts; in->nb_frames++; /* add duration to input PTS */