[FFmpeg-devel] [PATCH] lavfi: remove audio.h include from avfilter.h.

[Clément Bœsch]

avfilter.h is a public header and the unexported audio.h header contains
only internal prototypes.
---
 libavfilter/af_aconvert.c      |    1 +
 libavfilter/af_aformat.c       |    1 +
 libavfilter/af_amerge.c        |    1 +
 libavfilter/af_aresample.c     |    1 +
 libavfilter/af_ashowinfo.c     |    1 +
 libavfilter/af_asplit.c        |    1 +
 libavfilter/af_astreamsync.c   |    1 +
 libavfilter/af_earwax.c        |    1 +
 libavfilter/af_pan.c           |    1 +
 libavfilter/af_silencedetect.c |    1 +
 libavfilter/af_volume.c        |    1 +
 libavfilter/asrc_aevalsrc.c    |    1 +
 libavfilter/asrc_anullsrc.c    |    1 +
 libavfilter/avfilter.h         |    2 --
 libavfilter/src_buffer.c       |    1 +
 libavfilter/src_movie.c        |    1 +
 16 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
index e0f3474..9d420f8 100644
--- a/libavfilter/af_aconvert.c
+++ b/libavfilter/af_aconvert.c
@@ -28,6 +28,7 @@
 #include "libavutil/avstring.h"
 #include "libswresample/swresample.h"
 #include "avfilter.h"
+#include "audio.h"
 #include "internal.h"
 
 typedef struct {
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index ab64840..0a5857e 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -26,6 +26,7 @@
 #include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
 #include "avfilter.h"
+#include "audio.h"
 #include "internal.h"
 
 typedef struct {
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 6d141fe..faa64e1 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -25,6 +25,7 @@
 
 #include "libswresample/swresample.h" // only for SWR_CH_MAX
 #include "avfilter.h"
+#include "audio.h"
 #include "internal.h"
 
 #define QUEUE_SIZE 16
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index 23980d1..a2980d9 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -26,6 +26,7 @@
 
 #include "libswresample/swresample.h"
 #include "avfilter.h"
+#include "audio.h"
 #include "internal.h"
 
 typedef struct {
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index c336c52..11d85f0 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -26,6 +26,7 @@
 #include "libavutil/adler32.h"
 #include "libavutil/audioconvert.h"
 #include "libavutil/timestamp.h"
+#include "audio.h"
 #include "avfilter.h"
 
 typedef struct {
diff --git a/libavfilter/af_asplit.c b/libavfilter/af_asplit.c
index 3bdbeac..f63a29e 100644
--- a/libavfilter/af_asplit.c
+++ b/libavfilter/af_asplit.c
@@ -24,6 +24,7 @@
  */
 
 #include "avfilter.h"
+#include "audio.h"
 
 static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
 {
diff --git a/libavfilter/af_astreamsync.c b/libavfilter/af_astreamsync.c
index 2e8a02c..faa3b7c 100644
--- a/libavfilter/af_astreamsync.c
+++ b/libavfilter/af_astreamsync.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/eval.h"
 #include "avfilter.h"
+#include "audio.h"
 #include "internal.h"
 
 #define QUEUE_SIZE 16
diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c
index da5c06e..6afed72 100644
--- a/libavfilter/af_earwax.c
+++ b/libavfilter/af_earwax.c
@@ -31,6 +31,7 @@
 
 #include "libavutil/audioconvert.h"
 #include "avfilter.h"
+#include "audio.h"
 
 #define NUMTAPS 64
 
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index dba930e..fd65aac 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -31,6 +31,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libswresample/swresample.h"
+#include "audio.h"
 #include "avfilter.h"
 
 #define MAX_CHANNELS 63
diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
index 94197d7..093ca2b 100644
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
+#include "audio.h"
 #include "avfilter.h"
 
 typedef struct {
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 881a451..8e2e37e 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -26,6 +26,7 @@
 
 #include "libavutil/audioconvert.h"
 #include "libavutil/eval.h"
+#include "audio.h"
 #include "avfilter.h"
 
 typedef struct {
diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c
index 11750bb..4abcbc4 100644
--- a/libavfilter/asrc_aevalsrc.c
+++ b/libavfilter/asrc_aevalsrc.c
@@ -30,6 +30,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
+#include "audio.h"
 #include "internal.h"
 
 static const char * const var_names[] = {
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 86497b9..c396d7b 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -24,6 +24,7 @@
 #include "libavutil/audioconvert.h"
 #include "libavutil/opt.h"
 
+#include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
 
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 9fa6ab4..48a50fc 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -989,6 +989,4 @@ static inline void avfilter_insert_outpad(AVFilterContext *f, unsigned index,
                         &f->output_pads, &f->outputs, p);
 }
 
-#include "audio.h"
-
 #endif /* AVFILTER_AVFILTER_H */
diff --git a/libavfilter/src_buffer.c b/libavfilter/src_buffer.c
index f6c67f4..6355cce 100644
--- a/libavfilter/src_buffer.c
+++ b/libavfilter/src_buffer.c
@@ -27,6 +27,7 @@
 
 #include "avfilter.h"
 #include "internal.h"
+#include "audio.h"
 #include "avcodec.h"
 #include "buffersrc.h"
 #include "vsrc_buffer.h"
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 15b82ab..a00d30d 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -35,6 +35,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavformat/avformat.h"
+#include "audio.h"
 #include "avcodec.h"
 #include "avfilter.h"
 
-- 
1.7.10.1