[FFmpeg-devel] [PATCH 5/7] avfilter/internal: Don't include formats.h
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Fri Aug 4 03:49:59 EEST 2023
internal.h doesn't rely on it; instead include it directly
in every user that needs it (a filter needing it is basically
equivalent to it using FILTER_QUERY_FUNC, i.e. a majority of
filters doesn't need it).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
libavfilter/aeval.c | 1 +
libavfilter/af_aiir.c | 1 +
libavfilter/af_amerge.c | 1 +
libavfilter/af_anequalizer.c | 1 +
libavfilter/af_apulsator.c | 1 +
libavfilter/af_aresample.c | 1 +
libavfilter/af_asetrate.c | 1 +
libavfilter/af_asr.c | 1 +
libavfilter/af_biquads.c | 1 +
libavfilter/af_dialoguenhance.c | 1 +
libavfilter/af_hdcd.c | 1 +
libavfilter/af_headphone.c | 1 +
libavfilter/af_ladspa.c | 1 +
libavfilter/af_loudnorm.c | 1 +
libavfilter/af_lv2.c | 1 +
libavfilter/af_replaygain.c | 1 +
libavfilter/af_sofalizer.c | 1 +
libavfilter/af_virtualbass.c | 1 +
libavfilter/asrc_afdelaysrc.c | 1 +
libavfilter/asrc_afirsrc.c | 1 +
libavfilter/asrc_anoisesrc.c | 1 +
libavfilter/asrc_anullsrc.c | 1 +
libavfilter/asrc_hilbert.c | 1 +
libavfilter/asrc_sinc.c | 1 +
libavfilter/asrc_sine.c | 1 +
libavfilter/avf_concat.c | 1 +
libavfilter/avf_showcqt.c | 1 +
libavfilter/avf_showcwt.c | 1 +
libavfilter/avf_showfreqs.c | 1 +
libavfilter/avf_showspatial.c | 1 +
libavfilter/avf_showspectrum.c | 1 +
libavfilter/buffersink.c | 1 +
libavfilter/internal.h | 1 -
libavfilter/vf_copy.c | 1 +
libavfilter/vf_deband.c | 1 +
libavfilter/vf_elbg.c | 1 +
libavfilter/vf_extractplanes.c | 1 +
libavfilter/vf_feedback.c | 1 +
libavfilter/vf_fieldhint.c | 1 +
libavfilter/vf_fieldmatch.c | 1 +
libavfilter/vf_geq.c | 1 +
libavfilter/vf_il.c | 1 +
libavfilter/vf_libplacebo.c | 1 +
libavfilter/vf_mergeplanes.c | 1 +
libavfilter/vf_palettegen.c | 1 +
libavfilter/vf_paletteuse.c | 1 +
libavfilter/vf_shuffleplanes.c | 1 +
libavfilter/vf_weave.c | 1 +
48 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c
index 94d7690ef4..b26d75f129 100644
--- a/libavfilter/aeval.c
+++ b/libavfilter/aeval.c
@@ -33,6 +33,7 @@
#include "avfilter.h"
#include "audio.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
static const char * const var_names[] = {
diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c
index 28f452f4a1..41709aa360 100644
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@@ -26,6 +26,7 @@
#include "libavutil/xga_font_data.h"
#include "audio.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 801e592870..6ef05e213f 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -30,6 +30,7 @@
#include "avfilter.h"
#include "filters.h"
#include "audio.h"
+#include "formats.h"
#include "internal.h"
#define SWR_CH_MAX 64
diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c
index c9b74aa344..69a9c629cd 100644
--- a/libavfilter/af_anequalizer.c
+++ b/libavfilter/af_anequalizer.c
@@ -25,6 +25,7 @@
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "audio.h"
#include "video.h"
diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c
index 51b4344a39..909a50215e 100644
--- a/libavfilter/af_apulsator.c
+++ b/libavfilter/af_apulsator.c
@@ -22,6 +22,7 @@
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "audio.h"
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index ead85dd46d..f4bcc45616 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -33,6 +33,7 @@
#include "avfilter.h"
#include "audio.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
typedef struct AResampleContext {
diff --git a/libavfilter/af_asetrate.c b/libavfilter/af_asetrate.c
index f1e48b7087..50ccfc91b9 100644
--- a/libavfilter/af_asetrate.c
+++ b/libavfilter/af_asetrate.c
@@ -20,6 +20,7 @@
#include "libavutil/opt.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
typedef struct ASetRateContext {
diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c
index a9dd047cb3..884e17afb7 100644
--- a/libavfilter/af_asr.c
+++ b/libavfilter/af_asr.c
@@ -25,6 +25,7 @@
#include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
typedef struct ASRContext {
diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
index 1453f51a16..2bcc6fd4a5 100644
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@@ -71,6 +71,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
enum FilterType {
diff --git a/libavfilter/af_dialoguenhance.c b/libavfilter/af_dialoguenhance.c
index 1af2d17153..1762ea7cde 100644
--- a/libavfilter/af_dialoguenhance.c
+++ b/libavfilter/af_dialoguenhance.c
@@ -24,6 +24,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "window_func.h"
diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index d2cd71a0f3..a03c9aadf7 100644
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -47,6 +47,7 @@
#include "libavutil/opt.h"
#include "libavutil/avassert.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "audio.h"
diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c
index 03938c16ad..c8f753387f 100644
--- a/libavfilter/af_headphone.c
+++ b/libavfilter/af_headphone.c
@@ -29,6 +29,7 @@
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "audio.h"
diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c
index fc93d56af7..85e215850d 100644
--- a/libavfilter/af_ladspa.c
+++ b/libavfilter/af_ladspa.c
@@ -33,6 +33,7 @@
#include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
typedef struct MetaItem {
diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c
index 4888fa9b43..d83398ae2a 100644
--- a/libavfilter/af_loudnorm.c
+++ b/libavfilter/af_loudnorm.c
@@ -23,6 +23,7 @@
#include "libavutil/opt.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "audio.h"
#include "ebur128.h"
diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c
index 3cdf16457c..e577b1624d 100644
--- a/libavfilter/af_lv2.c
+++ b/libavfilter/af_lv2.c
@@ -33,6 +33,7 @@
#include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
typedef struct URITable {
diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c
index 128454aa6b..266121e2c0 100644
--- a/libavfilter/af_replaygain.c
+++ b/libavfilter/af_replaygain.c
@@ -30,6 +30,7 @@
#include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#define HISTOGRAM_SLOTS 12000
diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c
index acfd4323a5..60e0da30e9 100644
--- a/libavfilter/af_sofalizer.c
+++ b/libavfilter/af_sofalizer.c
@@ -36,6 +36,7 @@
#include "libavutil/opt.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "audio.h"
diff --git a/libavfilter/af_virtualbass.c b/libavfilter/af_virtualbass.c
index fb7189d364..9b9967c419 100644
--- a/libavfilter/af_virtualbass.c
+++ b/libavfilter/af_virtualbass.c
@@ -23,6 +23,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include <float.h>
diff --git a/libavfilter/asrc_afdelaysrc.c b/libavfilter/asrc_afdelaysrc.c
index 2fc57cee4d..a7d25c5309 100644
--- a/libavfilter/asrc_afdelaysrc.c
+++ b/libavfilter/asrc_afdelaysrc.c
@@ -25,6 +25,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
typedef struct AFDelaySrcContext {
diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c
index 2f09579c9c..e2359c159f 100644
--- a/libavfilter/asrc_afirsrc.c
+++ b/libavfilter/asrc_afirsrc.c
@@ -27,6 +27,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "window_func.h"
diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c
index 1c8dccf689..9a445534fc 100644
--- a/libavfilter/asrc_anoisesrc.c
+++ b/libavfilter/asrc_anoisesrc.c
@@ -23,6 +23,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index c071d8aa11..c89100c0dc 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -33,6 +33,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
typedef struct ANullContext {
diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c
index c8e8435467..98248e7e4e 100644
--- a/libavfilter/asrc_hilbert.c
+++ b/libavfilter/asrc_hilbert.c
@@ -22,6 +22,7 @@
#include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "filters.h"
#include "window_func.h"
diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c
index 175f030f46..16e587f1b9 100644
--- a/libavfilter/asrc_sinc.c
+++ b/libavfilter/asrc_sinc.c
@@ -27,6 +27,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
typedef struct SincContext {
diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c
index c0d8d2265b..c576b57fec 100644
--- a/libavfilter/asrc_sine.c
+++ b/libavfilter/asrc_sine.c
@@ -27,6 +27,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
typedef struct SineContext {
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index af758c5292..33edd7a394 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -28,6 +28,7 @@
#include "libavutil/opt.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
#include "audio.h"
diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c
index 4d1937d139..a7b6e5bcf5 100644
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@@ -29,6 +29,7 @@
#include "audio.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "lavfutils.h"
#include "lswsutils.h"
diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c
index 02b86345bb..83470deef8 100644
--- a/libavfilter/avf_showcwt.c
+++ b/libavfilter/avf_showcwt.c
@@ -30,6 +30,7 @@
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "audio.h"
+#include "formats.h"
#include "video.h"
#include "avfilter.h"
#include "filters.h"
diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c
index b8cff608eb..e90c9e8fcb 100644
--- a/libavfilter/avf_showfreqs.c
+++ b/libavfilter/avf_showfreqs.c
@@ -30,6 +30,7 @@
#include "libavutil/parseutils.h"
#include "audio.h"
#include "filters.h"
+#include "formats.h"
#include "video.h"
#include "avfilter.h"
#include "internal.h"
diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c
index 7b525aba8d..29b41bee85 100644
--- a/libavfilter/avf_showspatial.c
+++ b/libavfilter/avf_showspatial.c
@@ -28,6 +28,7 @@
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "audio.h"
+#include "formats.h"
#include "video.h"
#include "avfilter.h"
#include "filters.h"
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index b8e03d07a0..8cf73fce70 100644
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@@ -40,6 +40,7 @@
#include "libavutil/parseutils.h"
#include "libavutil/xga_font_data.h"
#include "audio.h"
+#include "formats.h"
#include "video.h"
#include "avfilter.h"
#include "filters.h"
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 6d83a9310c..9426ded7ee 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -37,6 +37,7 @@
#include "avfilter.h"
#include "buffersink.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 6bcabd012d..80d003fc02 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -26,7 +26,6 @@
#include "libavutil/internal.h"
#include "avfilter.h"
-#include "formats.h"
#include "framequeue.h"
typedef struct AVFilterCommand {
diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c
index 057b851b4c..52ac9fb0ec 100644
--- a/libavfilter/vf_copy.c
+++ b/libavfilter/vf_copy.c
@@ -24,6 +24,7 @@
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_deband.c b/libavfilter/vf_deband.c
index b3c36de8c3..177d888bed 100644
--- a/libavfilter/vf_deband.c
+++ b/libavfilter/vf_deband.c
@@ -24,6 +24,7 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c
index cc49b8e240..17947e226a 100644
--- a/libavfilter/vf_elbg.c
+++ b/libavfilter/vf_elbg.c
@@ -30,6 +30,7 @@
#include "avfilter.h"
#include "drawutils.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c
index 62c6002203..453e51a1ea 100644
--- a/libavfilter/vf_extractplanes.c
+++ b/libavfilter/vf_extractplanes.c
@@ -28,6 +28,7 @@
#include "avfilter.h"
#include "drawutils.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_feedback.c b/libavfilter/vf_feedback.c
index dc832c4671..33beae66ec 100644
--- a/libavfilter/vf_feedback.c
+++ b/libavfilter/vf_feedback.c
@@ -27,6 +27,7 @@
#include "libavutil/internal.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c
index ff940a50e6..8e1a4fc7aa 100644
--- a/libavfilter/vf_fieldhint.c
+++ b/libavfilter/vf_fieldhint.c
@@ -25,6 +25,7 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c
index b65e75534e..55671d8517 100644
--- a/libavfilter/vf_fieldmatch.c
+++ b/libavfilter/vf_fieldmatch.c
@@ -38,6 +38,7 @@
#include "libavutil/timestamp.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index 092124669f..912a4dd51c 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -31,6 +31,7 @@
#include "libavutil/eval.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c
index 05c393d914..1190d79fc7 100644
--- a/libavfilter/vf_il.c
+++ b/libavfilter/vf_il.c
@@ -28,6 +28,7 @@
#include "libavutil/imgutils.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 254e286530..3487991053 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -22,6 +22,7 @@
#include "libavutil/file.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
+#include "formats.h"
#include "internal.h"
#include "filters.h"
#include "video.h"
diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c
index 9bff5bbe63..91bc0d2c55 100644
--- a/libavfilter/vf_mergeplanes.c
+++ b/libavfilter/vf_mergeplanes.c
@@ -24,6 +24,7 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "framesync.h"
#include "video.h"
diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c
index 1c0836bee1..8985b42bcc 100644
--- a/libavfilter/vf_palettegen.c
+++ b/libavfilter/vf_palettegen.c
@@ -29,6 +29,7 @@
#include "libavutil/opt.h"
#include "libavutil/intreadwrite.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "palette.h"
#include "video.h"
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
index 463a2a6783..79d8fb2e51 100644
--- a/libavfilter/vf_paletteuse.c
+++ b/libavfilter/vf_paletteuse.c
@@ -31,6 +31,7 @@
#include "libavutil/qsort.h"
#include "avfilter.h"
#include "filters.h"
+#include "formats.h"
#include "framesync.h"
#include "internal.h"
#include "palette.h"
diff --git a/libavfilter/vf_shuffleplanes.c b/libavfilter/vf_shuffleplanes.c
index 1540eaad0e..fb2f85cf55 100644
--- a/libavfilter/vf_shuffleplanes.c
+++ b/libavfilter/vf_shuffleplanes.c
@@ -24,6 +24,7 @@
#include "libavutil/pixfmt.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c
index 6be4587089..84f3c5f337 100644
--- a/libavfilter/vf_weave.c
+++ b/libavfilter/vf_weave.c
@@ -22,6 +22,7 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
--
2.34.1
More information about the ffmpeg-devel
mailing list