All that remains in it are things that belong in avfilter_internal.h. Move them there and remove internal.h
@@ -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
@@ -28,7 +28,6 @@
#include "avfilter.h"
enum OutModes {
IN_MODE,
@@ -19,7 +19,6 @@
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{
@@ -35,7 +35,6 @@
#define MAX_SPLITS 16
#define MAX_BANDS MAX_SPLITS + 1
@@ -22,7 +22,6 @@
#include "libavutil/opt.h"
typedef struct LFOContext {
@@ -25,7 +25,6 @@
typedef struct DeclickChannel {
double *auxiliary;
typedef struct ChanDelay {
int64_t delay;
enum FilterType {
DC_TYPE,
@@ -20,7 +20,6 @@
typedef struct ADerivativeContext {
const AVClass *class;
@@ -26,7 +26,6 @@
typedef struct AudioEchoContext {
@@ -21,7 +21,6 @@
typedef struct BiquadCoeffs {
typedef struct ChannelParams {
@@ -29,7 +29,6 @@
typedef struct AudioFadeContext {
#include "libavutil/avstring.h"
#include "libavutil/mem.h"
-#include "libavfilter/internal.h"
#include "libavutil/common.h"
#include "libavutil/cpu.h"
@@ -41,7 +41,6 @@
#include "af_afirdsp.h"
#define MAX_IR_STREAMS 32
@@ -32,7 +32,6 @@
typedef struct AFormatContext {
#include "video.h"
typedef struct ThreadData {
@@ -33,7 +33,6 @@
typedef struct MetaItem {
int64_t pts;
#define SWR_CH_MAX 64
@@ -44,7 +44,6 @@
#define INPUT_ON 1 /**< input is active */
#define INPUT_EOF 2 /**< input has reached EOF (may still be active) */
typedef struct AudioMultiplyContext {
typedef struct AudioNLMDNDSPContext {
float (*compute_distance_ssd)(const float *f1, const float *f2, ptrdiff_t K);
#include "libavutil/internal.h"
const AVFilter ff_af_anull = {
typedef struct APadContext {
#include "generate_wave_table.h"
typedef struct AudioPhaserContext {
typedef struct AudioPsyClipContext {
@@ -24,7 +24,6 @@
enum PulsatorModes { SINE, TRIANGLE, SQUARE, SAWUP, SAWDOWN, NB_MODES };
typedef struct AResampleContext {
@@ -27,7 +27,6 @@
typedef struct ChanStats {
double u;
typedef struct ASNSContext {
typedef struct ASetRateContext {
@@ -39,7 +39,6 @@
typedef struct AShowInfoContext {
/**
#include "window_func.h"
#define MEASURE_ALL UINT_MAX
typedef struct ASRContext {
#define HISTOGRAM_SIZE 8192
#define HISTOGRAM_MAX (HISTOGRAM_SIZE-1)
@@ -48,7 +48,6 @@
* A fragment of audio waveform
typedef struct AudioXCorrelateContext {
@@ -73,7 +73,6 @@
biquad,
@@ -31,7 +31,6 @@
typedef void (*filter_func)(t_bs2bdp bs2bdp, uint8_t *sample, int n);
@@ -37,7 +37,6 @@
struct ChannelMap {
int in_channel;
#define MAX_CH 64
typedef struct ChorusContext {
@@ -36,7 +36,6 @@
typedef struct ChanParam {
double attack;
typedef struct CompensationDelayContext {
typedef struct DCShiftContext {
#include <float.h>
#define BINS 32768
#include "libavutil/tx.h"
#define RDFT_BITS_MIN 4
#define INTERPOLATION_LINEAR 0
@@ -49,7 +49,6 @@
#define PEAK_EXT_LEVEL 0x5981 /* + sizeof(peaktab)-1 = 0x8000 */
#define TIME_DOMAIN 0
typedef struct ChannelMap {
int input; ///< input stream index
#include "ebur128.h"
typedef struct URITable {
char **uris;
typedef struct CompandSegment {
double x, y;
#define MAX_CHANNELS 64
#define HISTOGRAM_SLOTS 12000
#define BUTTER_ORDER 2
typedef struct RubberBandContext {
#include "hermite.h"
typedef struct SidechainCompressContext {
typedef struct SilenceDetectContext {
enum SilenceDetect {
D_AVG,
@@ -38,7 +38,6 @@
#define MAX_ITEMS 882000
#define MIN_PEAK (1. / 32768.)
#define NBANDS 17
#define M 15
typedef struct TremoloContext {
#include "af_volume.h"
static const char * const precision_str[] = {
@@ -23,7 +23,6 @@
typedef struct VolDetectContext {
#undef ctype
static int null_filter_frame(AVFilterLink *link, AVFrame *frame)
typedef struct AFDelaySrcContext {
typedef struct AudioFIRSourceContext {
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
typedef struct ANullContext {
typedef struct FliteContext {
typedef struct SincContext {
typedef struct SineContext {
@@ -30,7 +30,6 @@
#include "avfilter_internal.h"
#include "framepool.h"
const AVFilterPad ff_audio_default_filterpad[1] = {
typedef struct Audio3dScopeContext {
typedef struct AudioBitScopeContext {
enum DisplayScale { LINEAR, SQRT, CBRT, LOG, RLOG, NB_SCALES };
enum AmplitudeScale { ALINEAR, ALOG, NB_ASCALES };
typedef struct AudioPhaseMeterContext {
enum VectorScopeMode {
LISSAJOUS,
#include "lavfutils.h"
#include "lswsutils.h"
typedef struct Coeffs {
float *val;
enum FrequencyScale {
FSCALE_LINEAR,
enum DataMode { MAGNITUDE, PHASE, DELAY, NB_DATA };
typedef struct ShowSpatialContext {
@@ -45,7 +45,6 @@
enum DisplayMode { COMBINED, SEPARATE, NB_MODES };
static const char *const var_names[] = { "VOLUME", "CHANNEL", "PEAK", NULL };
enum { VAR_VOLUME, VAR_CHANNEL, VAR_PEAK, VAR_VARS_NB };