[FFmpeg-devel,7/9] lavfi: include avfilterlink.h directly if needed.

Submitted by Nicolas George on Dec. 27, 2016, 6:02 p.m.

Details

Message ID 20161227180210.23100-7-george@nsup.org
State New
Headers show

Commit Message

Nicolas George Dec. 27, 2016, 6:02 p.m.
Also remove include framequeue.h, since it is pulled by
avfilterlink.h.

Signed-off-by: Nicolas George <george@nsup.org>
---
 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(-)

Comments

Michael Niedermayer Dec. 27, 2016, 8:08 p.m.
On Tue, Dec 27, 2016 at 07:02:08PM +0100, Nicolas George wrote:
> Also remove include framequeue.h, since it is pulled by
> avfilterlink.h.
> 
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>  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(-)

should be ok

thx

[...]

Patch hide | download patch | download mbox

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"