| Message ID | GV1P250MB0737BAE7A0E53C25FBE617578F08A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 6d15643173263c8ff9e9422bbbdcb843f4bc8f9c |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avfilter: Deduplicate default audio inputs/outputs | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index e00d14d084..5d3f4070a7 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -45,6 +45,7 @@ #include "internal.h" #include "af_afir.h" #include "af_afirdsp.h" +#include "video.h" static void drawtext(AVFrame *pic, int x, int y, const char *txt, uint32_t color) { diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 3e7ec78b63..28f452f4a1 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -27,6 +27,7 @@ #include "audio.h" #include "avfilter.h" #include "internal.h" +#include "video.h" typedef struct ThreadData { AVFrame *in, *out; diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index c7b9a83d99..c9b74aa344 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -27,6 +27,7 @@ #include "avfilter.h" #include "internal.h" #include "audio.h" +#include "video.h" #define FILTER_ORDER 4 diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index 21948db339..4d1937d139 100644 --- a/libavfilter/avf_showcqt.c +++ b/libavfilter/avf_showcqt.c @@ -32,6 +32,7 @@ #include "internal.h" #include "lavfutils.h" #include "lswsutils.h" +#include "video.h" #if CONFIG_LIBFREETYPE #include <ft2build.h> diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 04887b6ee5..1ebfbce909 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -43,6 +43,7 @@ #include "formats.h" #include "framepool.h" #include "internal.h" +#include "video.h" static void tlog_ref(void *ctx, AVFrame *ref, int end) { diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index 49f68c0e84..ca47a58334 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -43,6 +43,7 @@ #include "filters.h" #include "formats.h" #include "internal.h" +#include "video.h" #define ABS_THRES -70 ///< silence gate: we discard anything below this absolute (LUFS) threshold #define ABS_UP_THRES 10 ///< upper loud limit to consider (ABS_THRES being the minimum) diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 8b232a8d8f..6bcabd012d 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -28,7 +28,6 @@ #include "avfilter.h" #include "formats.h" #include "framequeue.h" -#include "video.h" typedef struct AVFilterCommand { double time; ///< time expressed in seconds diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 44c4854b35..ae32cd7324 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -23,6 +23,7 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "internal.h" +#include "video.h" typedef struct AvgBlurVulkanContext { FFVulkanContext vkctx; diff --git a/libavfilter/vf_blend_vulkan.c b/libavfilter/vf_blend_vulkan.c index 717efcee41..9db4e0a2f3 100644 --- a/libavfilter/vf_blend_vulkan.c +++ b/libavfilter/vf_blend_vulkan.c @@ -28,6 +28,7 @@ #include "internal.h" #include "framesync.h" #include "blend.h" +#include "video.h" #define IN_TOP 0 #define IN_BOTTOM 1 diff --git a/libavfilter/vf_chromaber_vulkan.c b/libavfilter/vf_chromaber_vulkan.c index 259232ab4d..8b196f149e 100644 --- a/libavfilter/vf_chromaber_vulkan.c +++ b/libavfilter/vf_chromaber_vulkan.c @@ -23,6 +23,7 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "internal.h" +#include "video.h" typedef struct ChromaticAberrationVulkanContext { FFVulkanContext vkctx; diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c index f1cad94ff1..95f71bc731 100644 --- a/libavfilter/vf_dctdnoiz.c +++ b/libavfilter/vf_dctdnoiz.c @@ -33,6 +33,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "internal.h" +#include "video.h" static const char *const var_names[] = { "c", NULL }; enum { VAR_C, VAR_VARS_NB }; diff --git a/libavfilter/vf_derain.c b/libavfilter/vf_derain.c index 35e1ae736a..3cb4364def 100644 --- a/libavfilter/vf_derain.c +++ b/libavfilter/vf_derain.c @@ -30,6 +30,7 @@ #include "dnn_filter_common.h" #include "formats.h" #include "internal.h" +#include "video.h" typedef struct DRContext { const AVClass *class; diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c index 95c3e0b99b..1ab2f25bda 100644 --- a/libavfilter/vf_dnn_processing.c +++ b/libavfilter/vf_dnn_processing.c @@ -32,6 +32,7 @@ #include "dnn_filter_common.h" #include "formats.h" #include "internal.h" +#include "video.h" #include "libswscale/swscale.h" #include "libavutil/time.h" diff --git a/libavfilter/vf_epx.c b/libavfilter/vf_epx.c index d706229ab8..bae1b898bc 100644 --- a/libavfilter/vf_epx.c +++ b/libavfilter/vf_epx.c @@ -19,6 +19,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "internal.h" +#include "video.h" typedef struct EPXContext { const AVClass *class; diff --git a/libavfilter/vf_eq.c b/libavfilter/vf_eq.c index 7955bf717e..3c686abe24 100644 --- a/libavfilter/vf_eq.c +++ b/libavfilter/vf_eq.c @@ -27,12 +27,13 @@ * very simple video equalizer */ -#include "libavfilter/internal.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "internal.h" #include "vf_eq.h" +#include "video.h" static void create_lut(EQParameters *param) { diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 08737d6415..62c6002203 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -29,6 +29,7 @@ #include "drawutils.h" #include "filters.h" #include "internal.h" +#include "video.h" #define PLANE_R 0x01 #define PLANE_G 0x02 diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index 17dd4f1e77..1489f3282b 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/tx.h" #include "internal.h" +#include "video.h" #include "window_func.h" #define MAX_BLOCK 256 diff --git a/libavfilter/vf_fftfilt.c b/libavfilter/vf_fftfilt.c index d2a6db24c8..2b2408f15c 100644 --- a/libavfilter/vf_fftfilt.c +++ b/libavfilter/vf_fftfilt.c @@ -24,7 +24,8 @@ * FFT domain filtering. */ -#include "libavfilter/internal.h" +#include "internal.h" +#include "video.h" #include "libavutil/common.h" #include "libavutil/cpu.h" #include "libavutil/imgutils.h" diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index 71bef7b30f..b65e75534e 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -39,6 +39,7 @@ #include "avfilter.h" #include "filters.h" #include "internal.h" +#include "video.h" #define INPUT_MAIN 0 #define INPUT_CLEANSRC 1 diff --git a/libavfilter/vf_flip_vulkan.c b/libavfilter/vf_flip_vulkan.c index d7790c3308..ecd2567ebc 100644 --- a/libavfilter/vf_flip_vulkan.c +++ b/libavfilter/vf_flip_vulkan.c @@ -24,6 +24,7 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "internal.h" +#include "video.h" enum FlipType { FLIP_VERTICAL, diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index 3e04fd01b9..b110c5a7d2 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -42,6 +42,7 @@ #include "internal.h" #include "qp_table.h" #include "vf_fspp.h" +#include "video.h" #define OFFSET(x) offsetof(FSPPContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c index 6f7532c1d4..bac05b87b8 100644 --- a/libavfilter/vf_gblur_vulkan.c +++ b/libavfilter/vf_gblur_vulkan.c @@ -24,6 +24,7 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "internal.h" +#include "video.h" #define CGS 32 #define GBLUR_MAX_KERNEL_SIZE 127 diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 2b53980278..e90b49366f 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "internal.h" +#include "video.h" #define MAX_NB_THREADS 32 #define NB_PLANES 4 diff --git a/libavfilter/vf_hqx.c b/libavfilter/vf_hqx.c index bc70d984e9..4a8ed184f4 100644 --- a/libavfilter/vf_hqx.c +++ b/libavfilter/vf_hqx.c @@ -31,6 +31,7 @@ #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "internal.h" +#include "video.h" typedef int (*hqxfunc_t)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c index e1c380a2cf..210ce8e821 100644 --- a/libavfilter/vf_il.c +++ b/libavfilter/vf_il.c @@ -29,6 +29,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" +#include "video.h" enum FilterMode { MODE_NONE, diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c index 8aec5afe98..260a99bcc4 100644 --- a/libavfilter/vf_kerndeint.c +++ b/libavfilter/vf_kerndeint.c @@ -34,6 +34,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "video.h" typedef struct KerndeintContext { const AVClass *class; diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 0733211d0b..254e286530 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -24,6 +24,7 @@ #include "libavutil/parseutils.h" #include "internal.h" #include "filters.h" +#include "video.h" #include "vulkan_filter.h" #include "scale_eval.h" diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index a2c3e79b9e..a33f6feebf 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -55,6 +55,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "video.h" enum MCDeintMode { MODE_FAST = 0, diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index ae55d819b8..9bff5bbe63 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -26,6 +26,7 @@ #include "avfilter.h" #include "internal.h" #include "framesync.h" +#include "video.h" typedef struct Mapping { int input; diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 71bc5e3c34..1cbed9bcf0 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -24,6 +24,7 @@ #include "formats.h" #include "internal.h" #include "vaapi_vpp.h" +#include "video.h" // Denoise min/max/default Values #define DENOISE_MIN 0 diff --git a/libavfilter/vf_nlmeans_vulkan.c b/libavfilter/vf_nlmeans_vulkan.c index 97d894c9bb..7da31b73f5 100644 --- a/libavfilter/vf_nlmeans_vulkan.c +++ b/libavfilter/vf_nlmeans_vulkan.c @@ -23,6 +23,7 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "internal.h" +#include "video.h" #define TYPE_NAME "vec4" #define TYPE_ELEMS 4 diff --git a/libavfilter/vf_overlay_vaapi.c b/libavfilter/vf_overlay_vaapi.c index 92227ead7f..c13db4e0d9 100644 --- a/libavfilter/vf_overlay_vaapi.c +++ b/libavfilter/vf_overlay_vaapi.c @@ -27,6 +27,7 @@ #include "formats.h" #include "internal.h" #include "vaapi_vpp.h" +#include "video.h" #include "libavutil/eval.h" enum var_name { diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index ef8e9fd59b..c09de24142 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -24,6 +24,7 @@ #include "vulkan_spirv.h" #include "internal.h" #include "framesync.h" +#include "video.h" typedef struct OverlayVulkanContext { FFVulkanContext vkctx; diff --git a/libavfilter/vf_owdenoise.c b/libavfilter/vf_owdenoise.c index bb99e8f33c..a728d2ba75 100644 --- a/libavfilter/vf_owdenoise.c +++ b/libavfilter/vf_owdenoise.c @@ -39,6 +39,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" +#include "video.h" typedef struct OWDenoiseContext { const AVClass *class; diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 4b69d3c63b..1c0836bee1 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -31,6 +31,7 @@ #include "avfilter.h" #include "internal.h" #include "palette.h" +#include "video.h" /* Reference a color and how much it's used */ struct color_ref { diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 5fa7a605ce..463a2a6783 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -34,6 +34,7 @@ #include "framesync.h" #include "internal.h" #include "palette.h" +#include "video.h" enum dithering_mode { DITHERING_NONE, diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c index 13a013a12d..2d563f7d8a 100644 --- a/libavfilter/vf_pp.c +++ b/libavfilter/vf_pp.c @@ -29,6 +29,7 @@ #include "internal.h" #include "qp_table.h" +#include "video.h" #include "libpostproc/postprocess.h" diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index b7c7cf9dde..4f0e60c2e2 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -34,6 +34,7 @@ #include "internal.h" #include "qp_table.h" #include "vf_pp7.h" +#include "video.h" enum mode { MODE_HARD, diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index acfc72947c..f13f752e43 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -24,6 +24,7 @@ #include "formats.h" #include "internal.h" #include "vaapi_vpp.h" +#include "video.h" // ProcAmp Min/Max/Default Values #define BRIGHTNESS_MIN -100.0F diff --git a/libavfilter/vf_sab.c b/libavfilter/vf_sab.c index a70d309633..ee6edd5a48 100644 --- a/libavfilter/vf_sab.c +++ b/libavfilter/vf_sab.c @@ -30,6 +30,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "video.h" typedef struct FilterParam { float radius; diff --git a/libavfilter/vf_scale_vt.c b/libavfilter/vf_scale_vt.c index a7f72c8de9..d5b4f12291 100644 --- a/libavfilter/vf_scale_vt.c +++ b/libavfilter/vf_scale_vt.c @@ -26,6 +26,7 @@ #include "libavutil/pixdesc.h" #include "internal.h" #include "scale_eval.h" +#include "video.h" typedef struct ScaleVtContext { AVClass *class; diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c index 3029cf2b42..6699bab934 100644 --- a/libavfilter/vf_scale_vulkan.c +++ b/libavfilter/vf_scale_vulkan.c @@ -25,6 +25,7 @@ #include "scale_eval.h" #include "internal.h" #include "colorspace.h" +#include "video.h" enum ScalerFunc { F_BILINEAR = 0, diff --git a/libavfilter/vf_scroll.c b/libavfilter/vf_scroll.c index 107686cb02..5b7d0ad11c 100644 --- a/libavfilter/vf_scroll.c +++ b/libavfilter/vf_scroll.c @@ -24,6 +24,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "video.h" typedef struct ScrollContext { const AVClass *class; diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index 48c28d2760..6c4719eab5 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -32,6 +32,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "video.h" #define RADIUS_MIN 0.1 #define RADIUS_MAX 5.0 diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 8442bcc597..efabe4dbae 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -38,6 +38,7 @@ #include "internal.h" #include "qp_table.h" #include "vf_spp.h" +#include "video.h" enum mode { MODE_HARD, diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index e06ae91d7c..b02b68ebe7 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -28,6 +28,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "video.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavformat/avio.h" diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 63f1fc72f2..e221a6f941 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -32,6 +32,7 @@ #include "avfilter.h" #include "internal.h" #include "tinterlace.h" +#include "video.h" #define OFFSET(x) offsetof(TInterlaceContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 52303a8b86..7c4729a381 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -25,6 +25,7 @@ #include "formats.h" #include "internal.h" #include "vaapi_vpp.h" +#include "video.h" typedef struct HDRVAAPIContext { VAAPIVPPContext vpp_ctx; // must be the first field diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c index c2e266cb1a..19c4f9b0b5 100644 --- a/libavfilter/vf_tpad.c +++ b/libavfilter/vf_tpad.c @@ -26,6 +26,7 @@ #include "internal.h" #include "formats.h" #include "drawutils.h" +#include "video.h" enum PadMode { MODE_ADD = 0, diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c index 5f1829dd05..d698b0d3d0 100644 --- a/libavfilter/vf_transpose_vaapi.c +++ b/libavfilter/vf_transpose_vaapi.c @@ -25,6 +25,7 @@ #include "internal.h" #include "transpose.h" #include "vaapi_vpp.h" +#include "video.h" typedef struct TransposeVAAPIContext { VAAPIVPPContext vpp_ctx; // must be the first field diff --git a/libavfilter/vf_transpose_vt.c b/libavfilter/vf_transpose_vt.c index 197ea5707c..b5b07e9ef1 100644 --- a/libavfilter/vf_transpose_vt.c +++ b/libavfilter/vf_transpose_vt.c @@ -26,6 +26,7 @@ #include "libavutil/pixdesc.h" #include "internal.h" #include "transpose.h" +#include "video.h" typedef struct TransposeVtContext { AVClass *class; diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index a8184cb6a4..3abe93be0b 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -25,6 +25,7 @@ #include "vulkan_spirv.h" #include "internal.h" #include "transpose.h" +#include "video.h" typedef struct TransposeVulkanContext { FFVulkanContext vkctx; diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index ffdaa907b2..5f410b98a5 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -37,6 +37,7 @@ #include "internal.h" #include "qp_table.h" #include "avfilter.h" +#include "video.h" #define MAX_LEVEL 8 /* quality levels */ #define BLOCK 16 diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 1914d7b348..9efc8ef5a0 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -28,6 +28,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" +#include "video.h" #include "vidstabutils.h" diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c index 2e64d81f27..6be4587089 100644 --- a/libavfilter/vf_weave.c +++ b/libavfilter/vf_weave.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" +#include "video.h" typedef struct WeaveContext { const AVClass *class; diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 6ae5310c9f..1750da043e 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -31,6 +31,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "internal.h" +#include "video.h" #define LB_MASK 0x00FEFEFE #define RED_BLUE_MASK 0x00FF00FF diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index 8825717890..f393dde202 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -23,6 +23,7 @@ #include "vulkan_spirv.h" #include "filters.h" #include "internal.h" +#include "video.h" #define IN_A 0 #define IN_B 1 diff --git a/libavfilter/vf_yaepblur.c b/libavfilter/vf_yaepblur.c index 28a74a85a0..473a444498 100644 --- a/libavfilter/vf_yaepblur.c +++ b/libavfilter/vf_yaepblur.c @@ -31,6 +31,7 @@ #include "libavutil/imgutils.h" #include "avfilter.h" #include "internal.h" +#include "video.h" typedef struct YAEPContext { const AVClass *class; diff --git a/libavfilter/vsrc_testsrc_vulkan.c b/libavfilter/vsrc_testsrc_vulkan.c index 7eacb57c80..8485fa498d 100644 --- a/libavfilter/vsrc_testsrc_vulkan.c +++ b/libavfilter/vsrc_testsrc_vulkan.c @@ -26,6 +26,7 @@ #include "internal.h" #include "filters.h" #include "colorspace.h" +#include "video.h" enum TestSrcVulkanMode { TESTSRC_COLOR, diff --git a/libavfilter/yadif_common.c b/libavfilter/yadif_common.c index 05474a5ba9..561659e346 100644 --- a/libavfilter/yadif_common.c +++ b/libavfilter/yadif_common.c @@ -22,6 +22,7 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "internal.h" +#include "video.h" #include "yadif.h" static int return_frame(AVFilterContext *ctx, int is_second)
internal.h does not depend on video.h (and should not depend on it) and therefore should not include video.h at all; instead all users of video.h should include it directly. Doing so also avoids unnecessary video.h inclusions in files that don't need it, like most audio filters. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- This patch is actually preparatory for 3/4: Otherwise, I couldn't include internal.h from video.h, because if a user included internal.h first (as almost all of them do), video.h would be included in internal.h above the definition of AVFilterPad, so that the declaration of ff_video_default_filterpad would error out. libavfilter/af_afir.c | 1 + libavfilter/af_aiir.c | 1 + libavfilter/af_anequalizer.c | 1 + libavfilter/avf_showcqt.c | 1 + libavfilter/avfilter.c | 1 + libavfilter/f_ebur128.c | 1 + libavfilter/internal.h | 1 - libavfilter/vf_avgblur_vulkan.c | 1 + libavfilter/vf_blend_vulkan.c | 1 + libavfilter/vf_chromaber_vulkan.c | 1 + libavfilter/vf_dctdnoiz.c | 1 + libavfilter/vf_derain.c | 1 + libavfilter/vf_dnn_processing.c | 1 + libavfilter/vf_epx.c | 1 + libavfilter/vf_eq.c | 3 ++- libavfilter/vf_extractplanes.c | 1 + libavfilter/vf_fftdnoiz.c | 1 + libavfilter/vf_fftfilt.c | 3 ++- libavfilter/vf_fieldmatch.c | 1 + libavfilter/vf_flip_vulkan.c | 1 + libavfilter/vf_fspp.c | 1 + libavfilter/vf_gblur_vulkan.c | 1 + libavfilter/vf_geq.c | 1 + libavfilter/vf_hqx.c | 1 + libavfilter/vf_il.c | 1 + libavfilter/vf_kerndeint.c | 1 + libavfilter/vf_libplacebo.c | 1 + libavfilter/vf_mcdeint.c | 1 + libavfilter/vf_mergeplanes.c | 1 + libavfilter/vf_misc_vaapi.c | 1 + libavfilter/vf_nlmeans_vulkan.c | 1 + libavfilter/vf_overlay_vaapi.c | 1 + libavfilter/vf_overlay_vulkan.c | 1 + libavfilter/vf_owdenoise.c | 1 + libavfilter/vf_palettegen.c | 1 + libavfilter/vf_paletteuse.c | 1 + libavfilter/vf_pp.c | 1 + libavfilter/vf_pp7.c | 1 + libavfilter/vf_procamp_vaapi.c | 1 + libavfilter/vf_sab.c | 1 + libavfilter/vf_scale_vt.c | 1 + libavfilter/vf_scale_vulkan.c | 1 + libavfilter/vf_scroll.c | 1 + libavfilter/vf_smartblur.c | 1 + libavfilter/vf_spp.c | 1 + libavfilter/vf_sr.c | 1 + libavfilter/vf_tinterlace.c | 1 + libavfilter/vf_tonemap_vaapi.c | 1 + libavfilter/vf_tpad.c | 1 + libavfilter/vf_transpose_vaapi.c | 1 + libavfilter/vf_transpose_vt.c | 1 + libavfilter/vf_transpose_vulkan.c | 1 + libavfilter/vf_uspp.c | 1 + libavfilter/vf_vidstabtransform.c | 1 + libavfilter/vf_weave.c | 1 + libavfilter/vf_xbr.c | 1 + libavfilter/vf_xfade_vulkan.c | 1 + libavfilter/vf_yaepblur.c | 1 + libavfilter/vsrc_testsrc_vulkan.c | 1 + libavfilter/yadif_common.c | 1 + 60 files changed, 61 insertions(+), 3 deletions(-)