From patchwork Sat Dec 24 17:41:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 1919 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp383733vsb; Sat, 24 Dec 2016 09:43:31 -0800 (PST) X-Received: by 10.28.188.87 with SMTP id m84mr17309788wmf.14.1482601410927; Sat, 24 Dec 2016 09:43:30 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l193si36318319wmd.94.2016.12.24.09.43.30; Sat, 24 Dec 2016 09:43:30 -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 AD73A689C51; Sat, 24 Dec 2016 19:42:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A2E3689BB8 for ; Sat, 24 Dec 2016 19:42:09 +0200 (EET) Received: from phare.normalesup.org (archicubes.ens.fr [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id uBOHgAmK095823 for ; Sat, 24 Dec 2016 18:42:10 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id 4E888E0087; Sat, 24 Dec 2016 18:42:10 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Dec 2016 18:41:46 +0100 Message-Id: <20161224174149.8995-15-george@nsup.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161224174149.8995-1-george@nsup.org> References: <20161224174149.8995-1-george@nsup.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Sat, 24 Dec 2016 18:42:10 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 14/17] lavfi: disallow ff_request_frame for filters using activate. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Having two different functions allows to have stricter tests and detect errors earlier. Signed-off-by: Nicolas George --- libavfilter/avfilter.c | 1 + libavfilter/internal.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c3e30b80b7..bacf6dc055 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -407,6 +407,7 @@ int ff_request_frame(AVFilterLink *link) { FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1); + av_assert1(!link->dst->filter->activate); if (link->status_out) return link->status_out; if (link->status_in) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 44d2fa38d5..a140617b68 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -508,6 +508,9 @@ int ff_poll_frame(AVFilterLink *link); /** * Request an input frame from the filter at the other end of the link. * + * This function must not be used by filters using the activate callback, + * use ff_link_set_frame_wanted() instead. + * * The input filter may pass the request on to its inputs, fulfill the * request from an internal buffer or any other means specific to its function. *