From patchwork Sat Feb 19 01:00:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 34401 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1435147nkx; Fri, 18 Feb 2022 16:59:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLET9/qVcOcTWk2PrRkn+FixsfDvJkSCiak5C1Z2CXnPWgDOiUYClO3/S58XLXS1ui38AW X-Received: by 2002:a17:906:bc46:b0:6cd:e855:18fc with SMTP id s6-20020a170906bc4600b006cde85518fcmr8089311ejv.263.1645232352439; Fri, 18 Feb 2022 16:59:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645232352; cv=none; d=google.com; s=arc-20160816; b=dL4Vgs6jLc/x6XDLbIz5AMbTc7tSi+pUg8fWa8Y14pxIz2tmpTa43f4GWXhYXSIgGp Dml+fm7sAl3zLIq0yPDRR6I5ZVSWEC97S2q2HHIMhS8vqBGHs+hvd1wqMIAG/l8TSQS4 pnG3bJScy3MqwdGgsMR178ZV86HHA3+M9RjiZjDOwAa7GI4ToZGuJ5rEJlsYHki0vOh2 iHtlh5NwUV55HNy3zPjFsV2TpMH2kTUYFLaVlRycZclMBEuCdMCC6edCLj43LJuQnox3 35t664EQtDsZg4Q2dJ8wtFixRgk6W23OwHtFKenGT9HT9JJVUkYQNegd8m0iqjnHjuTn ctzg== 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 :dkim-signature:delivered-to; bh=pA3WhsEfwMrcztlDVI+Fjvwcv6uZKmndWvywIc8JwCU=; b=Y1/AFKX0SMderXx6uybc13dXXk0WM1bzUjBVDwgFmi+H0FA7MGbCXRL32q4n0nRhDd ZnlUPwos7LQD3coinDp44fBIcBaDxhKA6dvGf1yzfYfkyuPHjYVqUoVkJHAlKJu2KHaa eDwjjFIZsq+q4wn4t3qyBb97H4xgLHIUUlHtw6mFrPorNdLQtCj073UPqNmk8IZrd3W8 9JayE5CYWq64V34dBP+hwXWkMXxhh08lMI8IVvH/idxSBg2uWDMzbuXuXUX/YpvMLUc3 +6IHVNZG8GFeyENjzKTooFbgw1SBlF2LrSPHBTCgXSdvzjsGhHqagIFoaqDyGGnDlY/w T9Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AY9ycgNe; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p3si4353934ejy.822.2022.02.18.16.59.09; Fri, 18 Feb 2022 16:59: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AY9ycgNe; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE48468B026; Sat, 19 Feb 2022 02:59:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E84868AEC9 for ; Sat, 19 Feb 2022 02:58:58 +0200 (EET) Received: by mail-ej1-f53.google.com with SMTP id qx21so18592432ejb.13 for ; Fri, 18 Feb 2022 16:58:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xtFlpR8ldyQ2gq23Tuu4XpFEr4V+BHOPOcOMY1HiFo0=; b=AY9ycgNewKx8zgmXaBOy3XG71tJIqxJyAh+gSOXahD2P0zEuYlPEr8H1eD5oTeEbJu +YskM9TVbMzqGNQZftpttLEGAVIqrAhYWmTK0yn+TBL58PEPkalTHullBQocZgAvileF b94I3mxCA+M8JyQ7FgMW8RQgxgDoUKuiCu26B8yzd5/XORdVI6m0Jo+h6TD6HiAmnpLA FPXf+dBBPPjOEIsWJKUokJsIELAvlsLDzFDYl0yasT12QWKpzObHvvvnhmIIuGkAlVjZ 5kRNmDqHl4cjVcnNf3Dbe7amWFPRqyj9Hdze5bRoHNkbOygT2+V0TyeV3+vN3Rvh2scq DRwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xtFlpR8ldyQ2gq23Tuu4XpFEr4V+BHOPOcOMY1HiFo0=; b=giA+zfn7SG4YOrjrQ/le/QW6g2xqvW+5tAWJ4uNAv2X+ugk/gRAY/DWQPWWthTeYLb 9U16vEglEiH2pMYLdRRdcXOAkVAW9i7deuRieuIM1MGsu3PGLYDjlRlQoK0e8rE2lEI5 AxgCuWRbpdU5o9TblhUsWqRTJGLiZHM7G9TjBDolQpC53OkTyhIiONd8DIdAdR52NmK9 yvjS4ci3mTax3I58OtnJdLdsfOAgs/NTCoavcQAQVuCpwnF1+TO704Qw74XTj9YR6ZeK q7oPE6EZiy/pb4l/3cNRHcjkeJzydaQDrnnWE/az+CQADocuOWpEsEACtLmZrEbcSCbN qKNg== X-Gm-Message-State: AOAM533GU+vRGL9qfoidX+9uBl4PefxkyG74ob520oDOVmL9Gim0nnqX pJ2wuLd0Y8/DvqY41bRf+7eyI9+mLO8= X-Received: by 2002:a17:906:c30f:b0:6a7:7de0:7e43 with SMTP id s15-20020a170906c30f00b006a77de07e43mr7922197ejz.475.1645232337798; Fri, 18 Feb 2022 16:58:57 -0800 (PST) Received: from localhost.localdomain ([95.168.120.42]) by smtp.gmail.com with ESMTPSA id e18sm5484932edj.85.2022.02.18.16.58.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 16:58:57 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 02:00:25 +0100 Message-Id: <20220219010025.153329-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_fps: only give frame as soon as possible if really requested by output 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: e+HU8irdyDMg Fixes OOM in #9081. Signed-off-by: Paul B Mahol --- libavfilter/vf_fps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 99e679441e..1a68d519fb 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -351,7 +351,7 @@ static int activate(AVFilterContext *ctx) if (s->frames_count > 0) { ret = write_frame(ctx, s, outlink, &again); /* Couldn't generate a frame, so schedule us to perform another step */ - if (again) + if (again && ff_outlink_frame_wanted(outlink)) ff_filter_set_ready(ctx, 100); return ret; }