lavfi: drop internal.h

All that remains in it are things that belong in avfilter_internal.h. Move them there and remove internal.h
5 months ago · 6d75d44d90
parent 90e4af65e1
commit 6d75d44d90
452 changed files with 24 additions and 503 deletions
--- a/libavfilter/aeval.c
+++ b/libavfilter/aeval.c
@ -34,7 +34,6 @@
 #include "audio.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 static const char * const var_names[] = {
    "ch",           ///< the value of the current channel
--- a/libavfilter/af_aap.c
+++ b/libavfilter/af_aap.c
@ -28,7 +28,6 @@
 #include "avfilter.h"
 #include "formats.h"
 #include "filters.h"
 #include "internal.h"
 enum OutModes {
    IN_MODE,
--- a/libavfilter/af_acopy.c
+++ b/libavfilter/af_acopy.c
@ -19,7 +19,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
--- a/libavfilter/af_acrossover.c
+++ b/libavfilter/af_acrossover.c
@ -35,7 +35,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #define MAX_SPLITS 16
 #define MAX_BANDS MAX_SPLITS + 1
--- a/libavfilter/af_acrusher.c
+++ b/libavfilter/af_acrusher.c
@ -22,7 +22,6 @@
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "audio.h"
 typedef struct LFOContext {
--- a/libavfilter/af_adeclick.c
+++ b/libavfilter/af_adeclick.c
@ -25,7 +25,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct DeclickChannel {
    double *auxiliary;
--- a/libavfilter/af_adelay.c
+++ b/libavfilter/af_adelay.c
@ -25,7 +25,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct ChanDelay {
    int64_t delay;
--- a/libavfilter/af_adenorm.c
+++ b/libavfilter/af_adenorm.c
@ -22,7 +22,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 enum FilterType {
    DC_TYPE,
--- a/libavfilter/af_aderivative.c
+++ b/libavfilter/af_aderivative.c
@ -20,7 +20,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct ADerivativeContext {
    const AVClass *class;
--- a/libavfilter/af_adrc.c
+++ b/libavfilter/af_adrc.c
@ -28,7 +28,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 static const char * const var_names[] = {
    "ch",           ///< the value of the current channel
--- a/libavfilter/af_aecho.c
+++ b/libavfilter/af_aecho.c
@ -26,7 +26,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct AudioEchoContext {
    const AVClass *class;
--- a/libavfilter/af_aemphasis.c
+++ b/libavfilter/af_aemphasis.c
@ -21,7 +21,6 @@
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "audio.h"
 typedef struct BiquadCoeffs {
--- a/libavfilter/af_aexciter.c
+++ b/libavfilter/af_aexciter.c
@ -22,7 +22,6 @@
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "audio.h"
 typedef struct ChannelParams {
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@ -29,7 +29,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct AudioFadeContext {
    const AVClass *class;
--- a/libavfilter/af_afftfilt.c
+++ b/libavfilter/af_afftfilt.c
@ -20,7 +20,6 @@
 #include "libavutil/avstring.h"
 #include "libavutil/mem.h"
 #include "libavfilter/internal.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
 #include "libavutil/opt.h"
--- a/libavfilter/af_afir.c
+++ b/libavfilter/af_afir.c
@ -41,7 +41,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "af_afirdsp.h"
 #define MAX_IR_STREAMS 32
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@ -32,7 +32,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct AFormatContext {
    const AVClass   *class;
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@ -29,7 +29,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 typedef struct ThreadData {
--- a/libavfilter/af_alimiter.c
+++ b/libavfilter/af_alimiter.c
@ -33,7 +33,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct MetaItem {
    int64_t pts;
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@ -32,7 +32,6 @@
 #include "filters.h"
 #include "audio.h"
 #include "formats.h"
 #include "internal.h"
 #define SWR_CH_MAX 64
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@ -44,7 +44,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #define INPUT_ON       1    /**< input is active */
 #define INPUT_EOF      2    /**< input has reached EOF (may still be active) */
--- a/libavfilter/af_amultiply.c
+++ b/libavfilter/af_amultiply.c
@ -26,7 +26,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct AudioMultiplyContext {
    const AVClass *class;
--- a/libavfilter/af_anequalizer.c
+++ b/libavfilter/af_anequalizer.c
@ -28,7 +28,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "audio.h"
 #include "video.h"
--- a/libavfilter/af_anlmdndsp.h
+++ b/libavfilter/af_anlmdndsp.h
@ -26,7 +26,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct AudioNLMDNDSPContext {
    float (*compute_distance_ssd)(const float *f1, const float *f2, ptrdiff_t K);
--- a/libavfilter/af_anlms.c
+++ b/libavfilter/af_anlms.c
@ -28,7 +28,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 enum OutModes {
    IN_MODE,
--- a/libavfilter/af_anull.c
+++ b/libavfilter/af_anull.c
@ -25,7 +25,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "libavutil/internal.h"
 const AVFilter ff_af_anull = {
--- a/libavfilter/af_apad.c
+++ b/libavfilter/af_apad.c
@ -33,7 +33,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct APadContext {
    const AVClass *class;
--- a/libavfilter/af_aphaser.c
+++ b/libavfilter/af_aphaser.c
@ -29,7 +29,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "generate_wave_table.h"
 typedef struct AudioPhaserContext {
--- a/libavfilter/af_apsyclip.c
+++ b/libavfilter/af_apsyclip.c
@ -25,7 +25,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct AudioPsyClipContext {
    const AVClass *class;
--- a/libavfilter/af_apulsator.c
+++ b/libavfilter/af_apulsator.c
@ -24,7 +24,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "audio.h"
 enum PulsatorModes { SINE, TRIANGLE, SQUARE, SAWUP, SAWDOWN, NB_MODES };
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@ -34,7 +34,6 @@
 #include "audio.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct AResampleContext {
    const AVClass *class;
--- a/libavfilter/af_arls.c
+++ b/libavfilter/af_arls.c
@ -27,7 +27,6 @@
 #include "avfilter.h"
 #include "formats.h"
 #include "filters.h"
 #include "internal.h"
 enum OutModes {
    IN_MODE,
--- a/libavfilter/af_asdr.c
+++ b/libavfilter/af_asdr.c
@ -26,7 +26,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct ChanStats {
    double u;
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@ -29,7 +29,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct ASNSContext {
    const AVClass *class;
--- a/libavfilter/af_asetrate.c
+++ b/libavfilter/af_asetrate.c
@ -22,7 +22,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct ASetRateContext {
    const AVClass *class;
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@ -39,7 +39,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct AShowInfoContext {
    /**
--- a/libavfilter/af_aspectralstats.c
+++ b/libavfilter/af_aspectralstats.c
@ -27,7 +27,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "window_func.h"
 #define MEASURE_ALL       UINT_MAX
--- a/libavfilter/af_asr.c
+++ b/libavfilter/af_asr.c
@ -28,7 +28,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct ASRContext {
    const AVClass *class;
--- a/libavfilter/af_astats.c
+++ b/libavfilter/af_astats.c
@ -27,7 +27,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #define HISTOGRAM_SIZE                  8192
 #define HISTOGRAM_MAX                   (HISTOGRAM_SIZE-1)
--- a/libavfilter/af_atempo.c
+++ b/libavfilter/af_atempo.c
@ -48,7 +48,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 /**
 * A fragment of audio waveform
--- a/libavfilter/af_axcorrelate.c
+++ b/libavfilter/af_axcorrelate.c
@ -26,7 +26,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct AudioXCorrelateContext {
    const AVClass *class;
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@ -73,7 +73,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 enum FilterType {
    biquad,
--- a/libavfilter/af_bs2b.c
+++ b/libavfilter/af_bs2b.c
@ -31,7 +31,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef void (*filter_func)(t_bs2bdp bs2bdp, uint8_t *sample, int n);
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@ -37,7 +37,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 struct ChannelMap {
    int in_channel;
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@ -33,7 +33,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #define MAX_CH 64
--- a/libavfilter/af_chorus.c
+++ b/libavfilter/af_chorus.c
@ -35,7 +35,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "generate_wave_table.h"
 typedef struct ChorusContext {
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@ -36,7 +36,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct ChanParam {
    double attack;
--- a/libavfilter/af_compensationdelay.c
+++ b/libavfilter/af_compensationdelay.c
@ -24,7 +24,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct CompensationDelayContext {
    const AVClass *class;
--- a/libavfilter/af_dcshift.c
+++ b/libavfilter/af_dcshift.c
@ -24,7 +24,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct DCShiftContext {
    const AVClass *class;
--- a/libavfilter/af_dialoguenhance.c
+++ b/libavfilter/af_dialoguenhance.c
@ -26,7 +26,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include <float.h>
--- a/libavfilter/af_drmeter.c
+++ b/libavfilter/af_drmeter.c
@ -26,7 +26,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #define BINS 32768
--- a/libavfilter/af_dynaudnorm.c
+++ b/libavfilter/af_dynaudnorm.c
@ -41,7 +41,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 static const char * const var_names[] = {
    "ch",           ///< the value of the current channel
--- a/libavfilter/af_firequalizer.c
+++ b/libavfilter/af_firequalizer.c
@ -27,7 +27,6 @@
 #include "libavutil/tx.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "audio.h"
 #define RDFT_BITS_MIN 4
--- a/libavfilter/af_flanger.c
+++ b/libavfilter/af_flanger.c
@ -24,7 +24,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 #include "generate_wave_table.h"
 #define INTERPOLATION_LINEAR    0
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@ -49,7 +49,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "audio.h"
 #define PEAK_EXT_LEVEL 0x5981 /* + sizeof(peaktab)-1 = 0x8000  */
--- a/libavfilter/af_headphone.c
+++ b/libavfilter/af_headphone.c
@ -31,7 +31,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "audio.h"
 #define TIME_DOMAIN      0
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@ -35,7 +35,6 @@
 #include "avfilter.h"
 #include "formats.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct ChannelMap {
    int input;                     ///< input stream index
--- a/libavfilter/af_ladspa.c
+++ b/libavfilter/af_ladspa.c
@ -36,7 +36,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct MetaItem {
    int64_t pts;
--- a/libavfilter/af_loudnorm.c
+++ b/libavfilter/af_loudnorm.c
@ -25,7 +25,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "audio.h"
 #include "ebur128.h"
--- a/libavfilter/af_lv2.c
+++ b/libavfilter/af_lv2.c
@ -36,7 +36,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct URITable {
    char    **uris;
--- a/libavfilter/af_mcompand.c
+++ b/libavfilter/af_mcompand.c
@ -36,7 +36,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct CompandSegment {
    double x, y;
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@ -37,7 +37,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #define MAX_CHANNELS 64
--- a/libavfilter/af_replaygain.c
+++ b/libavfilter/af_replaygain.c
@ -32,7 +32,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #define HISTOGRAM_SLOTS 12000
 #define BUTTER_ORDER        2
--- a/libavfilter/af_rubberband.c
+++ b/libavfilter/af_rubberband.c
@ -25,7 +25,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct RubberBandContext {
    const AVClass *class;
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@ -36,7 +36,6 @@
 #include "filters.h"
 #include "formats.h"
 #include "hermite.h"
 #include "internal.h"
 typedef struct SidechainCompressContext {
    const AVClass *class;
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@ -31,7 +31,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct SilenceDetectContext {
    const AVClass *class;
--- a/libavfilter/af_silenceremove.c
+++ b/libavfilter/af_silenceremove.c
@ -29,7 +29,6 @@
 #include "audio.h"
 #include "filters.h"
 #include "avfilter.h"
 #include "internal.h"
 enum SilenceDetect {
    D_AVG,
--- a/libavfilter/af_sofalizer.c
+++ b/libavfilter/af_sofalizer.c
@ -38,7 +38,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "audio.h"
 #define TIME_DOMAIN      0
--- a/libavfilter/af_speechnorm.c
+++ b/libavfilter/af_speechnorm.c
@ -38,7 +38,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #define MAX_ITEMS  882000
 #define MIN_PEAK (1. / 32768.)
--- a/libavfilter/af_superequalizer.c
+++ b/libavfilter/af_superequalizer.c
@ -26,7 +26,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #define NBANDS 17
 #define M 15
--- a/libavfilter/af_surround.c
+++ b/libavfilter/af_surround.c
@ -26,7 +26,6 @@
 #include "avfilter.h"
 #include "audio.h"
 #include "filters.h"
 #include "internal.h"
 #include "formats.h"
 #include "window_func.h"
--- a/libavfilter/af_tremolo.c
+++ b/libavfilter/af_tremolo.c
@ -22,7 +22,6 @@
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "audio.h"
 typedef struct TremoloContext {
--- a/libavfilter/af_vibrato.c
+++ b/libavfilter/af_vibrato.c
@ -22,7 +22,6 @@
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "audio.h"
 #include "generate_wave_table.h"
--- a/libavfilter/af_virtualbass.c
+++ b/libavfilter/af_virtualbass.c
@ -24,7 +24,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include <float.h>
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@ -37,7 +37,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "af_volume.h"
 static const char * const precision_str[] = {
--- a/libavfilter/af_volumedetect.c
+++ b/libavfilter/af_volumedetect.c
@ -23,7 +23,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 typedef struct VolDetectContext {
    /**
--- a/libavfilter/afir_template.c
+++ b/libavfilter/afir_template.c
@ -20,7 +20,6 @@
 #include "libavutil/tx.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "audio.h"
 #undef ctype
--- a/libavfilter/asink_anullsink.c
+++ b/libavfilter/asink_anullsink.c
@ -21,7 +21,6 @@
 #include "libavutil/internal.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 static int null_filter_frame(AVFilterLink *link, AVFrame *frame)
 {
--- a/libavfilter/asrc_afdelaysrc.c
+++ b/libavfilter/asrc_afdelaysrc.c
@ -25,7 +25,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct AFDelaySrcContext {
    const AVClass *class;
--- a/libavfilter/asrc_afirsrc.c
+++ b/libavfilter/asrc_afirsrc.c
@ -29,7 +29,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "window_func.h"
 typedef struct AudioFIRSourceContext {
--- a/libavfilter/asrc_anoisesrc.c
+++ b/libavfilter/asrc_anoisesrc.c
@ -24,7 +24,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@ -34,7 +34,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct ANullContext {
    const AVClass *class;
--- a/libavfilter/asrc_flite.c
+++ b/libavfilter/asrc_flite.c
@ -35,7 +35,6 @@
 #include "filters.h"
 #include "audio.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct FliteContext {
    const AVClass *class;
--- a/libavfilter/asrc_hilbert.c
+++ b/libavfilter/asrc_hilbert.c
@ -24,7 +24,6 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "filters.h"
 #include "window_func.h"
--- a/libavfilter/asrc_sinc.c
+++ b/libavfilter/asrc_sinc.c
@ -29,7 +29,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct SincContext {
    const AVClass *class;
--- a/libavfilter/asrc_sine.c
+++ b/libavfilter/asrc_sine.c
@ -29,7 +29,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 typedef struct SineContext {
    const AVClass *class;
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@ -30,7 +30,6 @@
 #include "avfilter_internal.h"
 #include "filters.h"
 #include "framepool.h"
 #include "internal.h"
 const AVFilterPad ff_audio_default_filterpad[1] = {
    {
--- a/libavfilter/avf_a3dscope.c
+++ b/libavfilter/avf_a3dscope.c
@ -27,7 +27,6 @@
 #include "formats.h"
 #include "audio.h"
 #include "video.h"
 #include "internal.h"
 typedef struct Audio3dScopeContext {
    const AVClass *class;
--- a/libavfilter/avf_abitscope.c
+++ b/libavfilter/avf_abitscope.c
@ -28,7 +28,6 @@
 #include "formats.h"
 #include "audio.h"
 #include "video.h"
 #include "internal.h"
 typedef struct AudioBitScopeContext {
    const AVClass *class;
--- a/libavfilter/avf_ahistogram.c
+++ b/libavfilter/avf_ahistogram.c
@ -25,7 +25,6 @@
 #include "filters.h"
 #include "formats.h"
 #include "video.h"
 #include "internal.h"
 enum DisplayScale   { LINEAR, SQRT, CBRT, LOG, RLOG, NB_SCALES };
 enum AmplitudeScale { ALINEAR, ALOG, NB_ASCALES };
--- a/libavfilter/avf_aphasemeter.c
+++ b/libavfilter/avf_aphasemeter.c
@ -35,7 +35,6 @@
 #include "formats.h"
 #include "audio.h"
 #include "video.h"
 #include "internal.h"
 typedef struct AudioPhaseMeterContext {
    const AVClass *class;
--- a/libavfilter/avf_avectorscope.c
+++ b/libavfilter/avf_avectorscope.c
@ -32,7 +32,6 @@
 #include "formats.h"
 #include "audio.h"
 #include "video.h"
 #include "internal.h"
 enum VectorScopeMode {
    LISSAJOUS,
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@ -30,7 +30,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 #include "audio.h"
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@ -31,7 +31,6 @@
 #include "avfilter.h"
 #include "filters.h"
 #include "formats.h"
 #include "internal.h"
 #include "lavfutils.h"
 #include "lswsutils.h"
 #include "video.h"
--- a/libavfilter/avf_showcqt.h
+++ b/libavfilter/avf_showcqt.h
@ -23,7 +23,6 @@
 #include "libavutil/tx.h"
 #include "avfilter.h"
 #include "internal.h"
 typedef struct Coeffs {
    float *val;
--- a/libavfilter/avf_showcwt.c
+++ b/libavfilter/avf_showcwt.c
@ -33,7 +33,6 @@
 #include "video.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 enum FrequencyScale {
    FSCALE_LINEAR,
--- a/libavfilter/avf_showfreqs.c
+++ b/libavfilter/avf_showfreqs.c
@ -34,7 +34,6 @@
 #include "formats.h"
 #include "video.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "window_func.h"
 enum DataMode       { MAGNITUDE, PHASE, DELAY, NB_DATA };
--- a/libavfilter/avf_showspatial.c
+++ b/libavfilter/avf_showspatial.c
@ -31,7 +31,6 @@
 #include "video.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "window_func.h"
 typedef struct ShowSpatialContext {
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@ -45,7 +45,6 @@
 #include "video.h"
 #include "avfilter.h"
 #include "filters.h"
 #include "internal.h"
 #include "window_func.h"
 enum DisplayMode  { COMBINED, SEPARATE, NB_MODES };
--- a/libavfilter/avf_showvolume.c
+++ b/libavfilter/avf_showvolume.c
@ -28,7 +28,6 @@
 #include "filters.h"
 #include "formats.h"
 #include "video.h"
 #include "internal.h"
 static const char *const var_names[] = {   "VOLUME",   "CHANNEL",   "PEAK",        NULL };
 enum                                   { VAR_VOLUME, VAR_CHANNEL, VAR_PEAK, VAR_VARS_NB };
--- a/Show More
+++ b/Show More