From patchwork Tue Dec 27 18:02:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 1949 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1594739vsb; Tue, 27 Dec 2016 10:03:28 -0800 (PST) X-Received: by 10.28.37.70 with SMTP id l67mr30193210wml.128.1482861807934; Tue, 27 Dec 2016 10:03:27 -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 pp3si50723215wjb.160.2016.12.27.10.03.26; Tue, 27 Dec 2016 10:03:27 -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 EC9C3689DC2; Tue, 27 Dec 2016 20:02:28 +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 60C03689D89 for ; Tue, 27 Dec 2016 20:02:20 +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 uBRI2Mqg003106 for ; Tue, 27 Dec 2016 19:02:22 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id 8D0E7E00F9; Tue, 27 Dec 2016 19:02:22 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Dec 2016 19:02:08 +0100 Message-Id: <20161227180210.23100-7-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:22 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 7/9] lavfi: include avfilterlink.h directly if needed. 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" Also remove include framequeue.h, since it is pulled by avfilterlink.h. Signed-off-by: Nicolas George --- libavfilter/af_amerge.c | 3 +-- libavfilter/avfilter.c | 3 +-- libavfilter/avfiltergraph.c | 3 +-- libavfilter/buffersink.c | 3 +-- libavfilter/f_interleave.c | 3 +-- libavfilter/framesync.c | 3 +-- libavfilter/internal.h | 1 + libavfilter/split.c | 3 +-- libavfilter/tests/filtfmts.c | 3 +-- libavfilter/vf_extractplanes.c | 3 +-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 8ea01e206b..eb8bc96386 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -24,13 +24,12 @@ */ #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "avfilterlink.h" #include "audio.h" #include "bufferqueue.h" #include "internal.h" diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 0020ee163a..8d106c1ab3 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -35,10 +35,9 @@ #include "libavutil/samplefmt.h" #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "audio.h" #include "avfilter.h" +#include "avfilterlink.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index cb5d618ab1..10df84faa5 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -33,9 +33,8 @@ #include "libavutil/pixdesc.h" #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "avfilter.h" +#include "avfilterlink.h" #include "formats.h" #include "internal.h" #include "thread.h" diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 030ca80315..f2d8872622 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -32,10 +32,9 @@ #include "libavutil/opt.h" #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "audio.h" #include "avfilter.h" +#include "avfilterlink.h" #include "buffersink.h" #include "internal.h" diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index b9192e9b14..cd17cbca70 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -28,9 +28,8 @@ #include "libavutil/opt.h" #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "avfilter.h" +#include "avfilterlink.h" #include "bufferqueue.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index eb05d66a86..ba92884430 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -19,10 +19,9 @@ */ #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "libavutil/avassert.h" #include "avfilter.h" +#include "avfilterlink.h" #include "bufferqueue.h" #include "framesync.h" #include "internal.h" diff --git a/libavfilter/internal.h b/libavfilter/internal.h index a8b69fd7f1..8e9aadd40b 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -27,6 +27,7 @@ #include "libavutil/internal.h" #include "avfilter.h" #include "avfiltergraph.h" +#include "avfilterlink.h" #include "formats.h" #include "framepool.h" #include "framequeue.h" diff --git a/libavfilter/split.c b/libavfilter/split.c index b85a221353..048606a3d3 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -31,9 +31,8 @@ #include "libavutil/opt.h" #define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "avfilter.h" +#include "avfilterlink.h" #include "audio.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 199d74d7a9..b6c866aa9e 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -26,9 +26,8 @@ #include "libavutil/samplefmt.h" #define FF_INTERNAL_FIELDS 1 -#include "libavfilter/framequeue.h" - #include "libavfilter/avfilter.h" +#include "libavfilter/avfilterlink.h" #include "libavfilter/formats.h" #include "libavfilter/internal.h" diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 65bba33d90..6ce930684e 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -24,9 +24,8 @@ #include "libavutil/pixdesc.h" #define FF_INTERNAL_FIELDS 1 -#include "libavfilter/framequeue.h" - #include "avfilter.h" +#include "avfilterlink.h" #include "drawutils.h" #include "internal.h"