From patchwork Tue Dec 27 18:02:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 1951 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1594874vsb; Tue, 27 Dec 2016 10:03:45 -0800 (PST) X-Received: by 10.28.144.70 with SMTP id s67mr28126965wmd.138.1482861825664; Tue, 27 Dec 2016 10:03:45 -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 b125si47071407wmd.55.2016.12.27.10.03.43; Tue, 27 Dec 2016 10:03:45 -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 ADFCE689DDD; Tue, 27 Dec 2016 20:02:30 +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 42741689D81 for ; Tue, 27 Dec 2016 20:02:23 +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 uBRI2PoR003125 for ; Tue, 27 Dec 2016 19:02:25 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id 779BFE00F9; Tue, 27 Dec 2016 19:02:25 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Dec 2016 19:02:10 +0100 Message-Id: <20161227180210.23100-9-george@nsup.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161227180210.23100-1-george@nsup.org> References: <20161227180210.23100-1-george@nsup.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Tue, 27 Dec 2016 19:02:25 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 9/9] lavfi: schedule avfilterlink.h for separate inclusion. 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" TODO APIChanges entry. Signed-off-by: Nicolas George --- libavfilter/avfilter.h | 2 ++ libavfilter/version.h | 4 ++++ 2 files changed, 6 insertions(+) Once again, I am not the one who wants AVFilterLink private. Patches 1-5 are worthy in their own right; for the others I will let people discuss it and push if I am told to push. diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index f219e2ad34..a3472547ea 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -377,7 +377,9 @@ struct AVFilterContext { unsigned ready; }; +#if FF_API_AVFILTERLINK_PUBLIC #include "avfilterlink.h" +#endif /** * Link two filters together. diff --git a/libavfilter/version.h b/libavfilter/version.h index e3bd8d0084..89b5f047ab 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -67,5 +67,9 @@ #ifndef FF_API_NOCONST_GET_NAME #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #endif +#ifndef FF_API_AVFILTERLINK_PUBLIC +#define FF_API_AVFILTERLINK_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 8) +#endif + #endif /* AVFILTER_VERSION_H */