avfilter/internal: Don't include video.h

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>

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)
 {

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;

libavfilter/af_anequalizer.c

@@ -27,6 +27,7 @@
 #include "avfilter.h"
 #include "internal.h"
 #include "audio.h"
+#include "video.h"
 
 #define FILTER_ORDER 4
 

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>

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)
 {

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)

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

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;

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

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;

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 };

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;

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"
 

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;

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)
 {

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

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

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"

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

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,

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

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

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

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);
 

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,

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;

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"
 

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,

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;

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

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

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 {

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;

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;

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 {

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,

libavfilter/vf_pp.c

@@ -29,6 +29,7 @@
 
 #include "internal.h"
 #include "qp_table.h"
+#include "video.h"
 
 #include "libpostproc/postprocess.h"
 

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,

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

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;

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;

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,

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;

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

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,

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"

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

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

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,

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

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;

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;

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

libavfilter/vf_vidstabtransform.c

@@ -28,6 +28,7 @@
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"
+#include "video.h"
 
 #include "vidstabutils.h"
 

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;

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

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

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;

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,

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)