From patchwork Sat Aug 17 08:13:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp881882vqj; Sat, 17 Aug 2024 01:14:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWHmV6/Z8I5THgQMj3OmnQYqvxw8OOkpOqGz0NW+hVSwEbqxgjHh9br77CYUcMXtqNO+17gfgaowqtPeaD1Sml@gmail.com X-Google-Smtp-Source: AGHT+IEiAJko0ynXtQkIC0NGqf7oqFzlZzDtVIFxDNKzhIBkY9AtY/Jg62us4zTmOSfDd8wE3xav X-Received: by 2002:a05:6402:2810:b0:5a1:c63c:7d7a with SMTP id 4fb4d7f45d1cf-5beca74fb7amr2517388a12.2.1723882495356; Sat, 17 Aug 2024 01:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882495; cv=none; d=google.com; s=arc-20160816; b=pkFgxnNVjewyjhE+yDnpWzIziZYte8m3LvzJ8+VElfCsJwodUT8wv8kRBMgvkHYj0d TvrYiikNZucWEPGDFtqwFcNvCCUIF/8VShk4PBTzqEhtHHd7cx15PXIgJlRIqRMfNFhV 1twlJQNM06kenaZIe+zERZxafYoOentifivsou8lmhXrFpI74SDkQ6MQcyKruS+AWCaW tM4W+VCwErPAU8/XlQj4itcmjTmkPvU3TJLBX7Q+1L3fv+KX+3I0HQcX2rViZzoPB9Ej rSzx90tbOmY4Z6wXWJd1h+go34yl5wKZQVF8sWwoxKvmodG4kf1X6NUwgl8SBaZ+DDIf GKcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=MF4NnvYXS/7LEIQFb5uLgBCAvRdWg6pfkKFPBeZvId4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=a/jzw8jbwEsg6KAJwwL7qv5hu5tw4c8NDGcmdeiFV0Ep9TUSvowp6VDjhKInjPcsNK rVA0Ncw60zXSeU1PBO+5GUsmY9S22WMgrbZUAQpgyCcBQTTOIh7LmVMKRdS51PcF3Bwm oF4YWbaWFveq4l8ZQ1E+n6OaRjKB6qJbJSXEfbWIf3MSmKDSmGrA6nKogLRsS+W5fd0o jhNEJLTw9OGpqrVx6eeRqygwViX+gbwOUAZ6fZ9BcFcs5ttPX8cVH9YKST1jc6KWqlvZ 2RxhFgwHba/QWLiPE4gQOUI3aqs5CcuMwph0wSbLE6R7kJpJmFSmovAFdKtFWNSsvNj+ rn1g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=VqyBB7ee; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5bebc0c77d7si3041921a12.648.2024.08.17.01.14.54; Sat, 17 Aug 2024 01:14:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=VqyBB7ee; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AD0568DD05; Sat, 17 Aug 2024 11:14:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 970B368DCE3 for ; Sat, 17 Aug 2024 11:14:10 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=VqyBB7ee; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 32C674DEC for ; Sat, 17 Aug 2024 10:14:10 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ib1Pg3MGTP1l for ; Sat, 17 Aug 2024 10:14:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=0aDP2uMzkrO3VWCmw0q7wrYTsNed9YIPYqVL8n6MnuI=; h=From:To:Subject:Date:From; b=VqyBB7eewQ4MFV098dXMnpTa992oYzBRCikDMKFX+UHgnfGbRyvZGFMyneXim8ANG RObBzu6X+yQYEejXb0MUVjw6YJqL+GMpG4QyILHZd3ZCd8grC/IkD6c1CCLMF4sOLa te06/y+1CcQiiy01dSFil9OX90ctf1N+rHIGQt4J3BfQBCy1M9A3Ji2AVPo/QX8nKX Ro5N0zBmbm8AfbuHi7lMEV5LQh7Gjee670pexY5qLDeEkeuOOZNyn3QPwfV1lTdw2b 3o1lX5XN6uPaaEfENftp7VMWISIGELBjAtiaATyUbD9e9GpOnGGxopiF85iq/LSlxx X723h7tejYU+g== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9BF964DE4 for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 20A413A0357 for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:51 +0200 Message-ID: <20240817081358.2354-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] lavfi/internal: move functions used by filters to filters.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WK4GCqEyBgDO internal.h currently mixes interfaces intended to be used by filters with those that should be limited to generic filter- or graph-level code. --- libavfilter/af_acontrast.c | 1 + libavfilter/af_acopy.c | 1 + libavfilter/af_acrusher.c | 1 + libavfilter/af_adecorrelate.c | 1 + libavfilter/af_adenorm.c | 1 + libavfilter/af_aderivative.c | 1 + libavfilter/af_adynamicequalizer.c | 1 + libavfilter/af_adynamicsmooth.c | 1 + libavfilter/af_aemphasis.c | 1 + libavfilter/af_aexciter.c | 1 + libavfilter/af_aformat.c | 1 + libavfilter/af_afreqshift.c | 1 + libavfilter/af_alimiter.c | 1 + libavfilter/af_anequalizer.c | 1 + libavfilter/af_anull.c | 1 + libavfilter/af_aphaser.c | 1 + libavfilter/af_apulsator.c | 1 + libavfilter/af_asetrate.c | 1 + libavfilter/af_asoftclip.c | 1 + libavfilter/af_asr.c | 1 + libavfilter/af_astats.c | 1 + libavfilter/af_asubboost.c | 1 + libavfilter/af_asupercut.c | 1 + libavfilter/af_atempo.c | 1 + libavfilter/af_atilt.c | 1 + libavfilter/af_bs2b.c | 1 + libavfilter/af_channelmap.c | 1 + libavfilter/af_chorus.c | 1 + libavfilter/af_compand.c | 1 + libavfilter/af_compensationdelay.c | 1 + libavfilter/af_crystalizer.c | 1 + libavfilter/af_dcshift.c | 1 + libavfilter/af_deesser.c | 1 + libavfilter/af_drmeter.c | 1 + libavfilter/af_earwax.c | 1 + libavfilter/af_extrastereo.c | 1 + libavfilter/af_flanger.c | 1 + libavfilter/af_haas.c | 1 + libavfilter/af_hdcd.c | 1 + libavfilter/af_ladspa.c | 1 + libavfilter/af_mcompand.c | 1 + libavfilter/af_pan.c | 1 + libavfilter/af_silencedetect.c | 1 + libavfilter/af_stereotools.c | 1 + libavfilter/af_stereowiden.c | 1 + libavfilter/af_tremolo.c | 1 + libavfilter/af_vibrato.c | 1 + libavfilter/af_volumedetect.c | 1 + libavfilter/asink_anullsink.c | 1 + libavfilter/audio.c | 1 + libavfilter/audio.h | 2 +- libavfilter/avfiltergraph.c | 1 + libavfilter/dnn/dnn_interface.c | 2 + libavfilter/f_bench.c | 1 + libavfilter/f_realtime.c | 1 + libavfilter/f_reverse.c | 1 + libavfilter/f_sidedata.c | 1 + libavfilter/f_zmq.c | 1 + libavfilter/filters.h | 292 ++++++++++++++++++++++++++++ libavfilter/formats.c | 1 + libavfilter/graphdump.c | 1 + libavfilter/graphparser.c | 1 + libavfilter/internal.h | 292 ---------------------------- libavfilter/vf_addroi.c | 1 + libavfilter/vf_amplify.c | 1 + libavfilter/vf_aspect.c | 1 + libavfilter/vf_atadenoise.c | 1 + libavfilter/vf_avgblur.c | 1 + libavfilter/vf_avgblur_opencl.c | 1 + libavfilter/vf_avgblur_vulkan.c | 2 + libavfilter/vf_backgroundkey.c | 1 + libavfilter/vf_bilateral.c | 1 + libavfilter/vf_bitplanenoise.c | 1 + libavfilter/vf_blackframe.c | 1 + libavfilter/vf_boxblur.c | 1 + libavfilter/vf_bwdif.c | 1 + libavfilter/vf_cas.c | 1 + libavfilter/vf_chromaber_vulkan.c | 2 + libavfilter/vf_chromakey.c | 1 + libavfilter/vf_chromanr.c | 1 + libavfilter/vf_chromashift.c | 1 + libavfilter/vf_ciescope.c | 1 + libavfilter/vf_codecview.c | 1 + libavfilter/vf_colorbalance.c | 1 + libavfilter/vf_colorchannelmixer.c | 1 + libavfilter/vf_colorconstancy.c | 1 + libavfilter/vf_colorcontrast.c | 1 + libavfilter/vf_colorcorrect.c | 1 + libavfilter/vf_colorize.c | 1 + libavfilter/vf_colorkey.c | 1 + libavfilter/vf_colorkey_opencl.c | 1 + libavfilter/vf_colorlevels.c | 1 + libavfilter/vf_colormatrix.c | 1 + libavfilter/vf_colorspace.c | 1 + libavfilter/vf_colortemperature.c | 1 + libavfilter/vf_convolution.c | 1 + libavfilter/vf_convolution_opencl.c | 1 + libavfilter/vf_copy.c | 1 + libavfilter/vf_cropdetect.c | 1 + libavfilter/vf_curves.c | 1 + libavfilter/vf_dblur.c | 1 + libavfilter/vf_dctdnoiz.c | 2 + libavfilter/vf_deband.c | 1 + libavfilter/vf_deblock.c | 1 + libavfilter/vf_deflicker.c | 1 + libavfilter/vf_derain.c | 1 + libavfilter/vf_deshake.c | 1 + libavfilter/vf_despill.c | 1 + libavfilter/vf_drawbox.c | 1 + libavfilter/vf_drawbox_vaapi.c | 1 + libavfilter/vf_edgedetect.c | 1 + libavfilter/vf_elbg.c | 1 + libavfilter/vf_entropy.c | 1 + libavfilter/vf_epx.c | 2 + libavfilter/vf_exposure.c | 1 + libavfilter/vf_fftdnoiz.c | 2 + libavfilter/vf_field.c | 1 + libavfilter/vf_fieldorder.c | 1 + libavfilter/vf_fillborders.c | 1 + libavfilter/vf_flip_vulkan.c | 2 + libavfilter/vf_format.c | 1 + libavfilter/vf_fspp.c | 2 + libavfilter/vf_gblur.c | 1 + libavfilter/vf_gblur_vulkan.c | 2 + libavfilter/vf_gradfun.c | 1 + libavfilter/vf_grayworld.c | 1 + libavfilter/vf_hflip.c | 1 + libavfilter/vf_histeq.c | 1 + libavfilter/vf_histogram.c | 1 + libavfilter/vf_hqdn3d.c | 1 + libavfilter/vf_hqx.c | 1 + libavfilter/vf_hsvkey.c | 1 + libavfilter/vf_huesaturation.c | 1 + libavfilter/vf_iccdetect.c | 1 + libavfilter/vf_iccgen.c | 1 + libavfilter/vf_idet.c | 1 + libavfilter/vf_il.c | 1 + libavfilter/vf_kerndeint.c | 1 + libavfilter/vf_lagfun.c | 1 + libavfilter/vf_lenscorrection.c | 1 + libavfilter/vf_libopencv.c | 1 + libavfilter/vf_limiter.c | 1 + libavfilter/vf_lumakey.c | 1 + libavfilter/vf_lut.c | 1 + libavfilter/vf_lut3d.c | 1 + libavfilter/vf_maskfun.c | 1 + libavfilter/vf_mcdeint.c | 1 + libavfilter/vf_median.c | 1 + libavfilter/vf_mestimate.c | 1 + libavfilter/vf_misc_vaapi.c | 1 + libavfilter/vf_monochrome.c | 1 + libavfilter/vf_mpdecimate.c | 1 + libavfilter/vf_negate.c | 1 + libavfilter/vf_neighbor.c | 1 + libavfilter/vf_neighbor_opencl.c | 1 + libavfilter/vf_nlmeans.c | 1 + libavfilter/vf_nlmeans_opencl.c | 1 + libavfilter/vf_nlmeans_vulkan.c | 2 + libavfilter/vf_noise.c | 1 + libavfilter/vf_normalize.c | 1 + libavfilter/vf_null.c | 1 + libavfilter/vf_ocr.c | 1 + libavfilter/vf_overlay_opencl.c | 1 + libavfilter/vf_overlay_vulkan.c | 2 + libavfilter/vf_owdenoise.c | 1 + libavfilter/vf_pad.c | 1 + libavfilter/vf_pad_opencl.c | 1 + libavfilter/vf_pad_vaapi.c | 1 + libavfilter/vf_palettegen.c | 1 + libavfilter/vf_phase.c | 1 + libavfilter/vf_pixdesctest.c | 1 + libavfilter/vf_pixelize.c | 1 + libavfilter/vf_pp.c | 1 + libavfilter/vf_pp7.c | 2 + libavfilter/vf_procamp_vaapi.c | 1 + libavfilter/vf_program_opencl.c | 1 + libavfilter/vf_pseudocolor.c | 1 + libavfilter/vf_pullup.c | 1 + libavfilter/vf_qp.c | 1 + libavfilter/vf_quirc.c | 1 + libavfilter/vf_random.c | 1 + libavfilter/vf_readeia608.c | 1 + libavfilter/vf_readvitc.c | 1 + libavfilter/vf_removegrain.c | 1 + libavfilter/vf_removelogo.c | 1 + libavfilter/vf_sab.c | 1 + libavfilter/vf_scale_vaapi.c | 1 + libavfilter/vf_scale_vulkan.c | 1 + libavfilter/vf_scroll.c | 1 + libavfilter/vf_selectivecolor.c | 1 + libavfilter/vf_setparams.c | 1 + libavfilter/vf_shear.c | 1 + libavfilter/vf_showpalette.c | 1 + libavfilter/vf_shuffleframes.c | 1 + libavfilter/vf_shufflepixels.c | 1 + libavfilter/vf_shuffleplanes.c | 1 + libavfilter/vf_siti.c | 1 + libavfilter/vf_smartblur.c | 1 + libavfilter/vf_spp.c | 2 + libavfilter/vf_sr.c | 1 + libavfilter/vf_subtitles.c | 2 + libavfilter/vf_super2xsai.c | 1 + libavfilter/vf_swapuv.c | 1 + libavfilter/vf_thumbnail.c | 1 + libavfilter/vf_tiltandshift.c | 1 + libavfilter/vf_tmidequalizer.c | 1 + libavfilter/vf_tonemap.c | 1 + libavfilter/vf_tonemap_opencl.c | 1 + libavfilter/vf_tonemap_vaapi.c | 1 + libavfilter/vf_transpose.c | 1 + libavfilter/vf_unsharp.c | 1 + libavfilter/vf_unsharp_opencl.c | 1 + libavfilter/vf_uspp.c | 2 + libavfilter/vf_v360.c | 1 + libavfilter/vf_vaguedenoiser.c | 1 + libavfilter/vf_vectorscope.c | 1 + libavfilter/vf_vflip.c | 1 + libavfilter/vf_vfrdet.c | 2 + libavfilter/vf_vibrance.c | 1 + libavfilter/vf_vidstabtransform.c | 1 + libavfilter/vf_vmafmotion.c | 1 + libavfilter/vf_waveform.c | 1 + libavfilter/vf_xbr.c | 2 + libavfilter/vf_yadif.c | 1 + libavfilter/vf_yaepblur.c | 1 + libavfilter/vf_zscale.c | 1 + libavfilter/video.c | 1 + libavfilter/video.h | 2 +- libavfilter/vsink_nullsink.c | 1 + 229 files changed, 536 insertions(+), 294 deletions(-) diff --git a/libavfilter/af_acontrast.c b/libavfilter/af_acontrast.c index 1fcbad8782..e520b1b66b 100644 --- a/libavfilter/af_acontrast.c +++ b/libavfilter/af_acontrast.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" typedef struct AudioContrastContext { const AVClass *class; diff --git a/libavfilter/af_acopy.c b/libavfilter/af_acopy.c index f65f04d461..62faa9004c 100644 --- a/libavfilter/af_acopy.c +++ b/libavfilter/af_acopy.c @@ -18,6 +18,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" static int filter_frame(AVFilterLink *inlink, AVFrame *in) diff --git a/libavfilter/af_acrusher.c b/libavfilter/af_acrusher.c index 48d7029b05..7c1f8706aa 100644 --- a/libavfilter/af_acrusher.c +++ b/libavfilter/af_acrusher.c @@ -21,6 +21,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_adecorrelate.c b/libavfilter/af_adecorrelate.c index 7216c3fc83..5cde9e7e18 100644 --- a/libavfilter/af_adecorrelate.c +++ b/libavfilter/af_adecorrelate.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #define MAX_STAGES 16 #define FILTER_FC 1100.0 diff --git a/libavfilter/af_adenorm.c b/libavfilter/af_adenorm.c index f5f9039172..4182dd67f5 100644 --- a/libavfilter/af_adenorm.c +++ b/libavfilter/af_adenorm.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" enum FilterType { diff --git a/libavfilter/af_aderivative.c b/libavfilter/af_aderivative.c index 4883972dcf..667bcee50a 100644 --- a/libavfilter/af_aderivative.c +++ b/libavfilter/af_aderivative.c @@ -19,6 +19,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct ADerivativeContext { diff --git a/libavfilter/af_adynamicequalizer.c b/libavfilter/af_adynamicequalizer.c index 59fdaf99b7..7a102cad22 100644 --- a/libavfilter/af_adynamicequalizer.c +++ b/libavfilter/af_adynamicequalizer.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" enum DetectionModes { diff --git a/libavfilter/af_adynamicsmooth.c b/libavfilter/af_adynamicsmooth.c index 8afe592226..a0276616ca 100644 --- a/libavfilter/af_adynamicsmooth.c +++ b/libavfilter/af_adynamicsmooth.c @@ -20,6 +20,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" typedef struct AudioDynamicSmoothContext { const AVClass *class; diff --git a/libavfilter/af_aemphasis.c b/libavfilter/af_aemphasis.c index d808eec1ca..58931ad92b 100644 --- a/libavfilter/af_aemphasis.c +++ b/libavfilter/af_aemphasis.c @@ -20,6 +20,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_aexciter.c b/libavfilter/af_aexciter.c index 1f1639d24c..76a191dd87 100644 --- a/libavfilter/af_aexciter.c +++ b/libavfilter/af_aexciter.c @@ -21,6 +21,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 8a3bdee7f8..6e0f88dbb0 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -30,6 +30,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_afreqshift.c b/libavfilter/af_afreqshift.c index 9a6cfd2fc1..fa93eed995 100644 --- a/libavfilter/af_afreqshift.c +++ b/libavfilter/af_afreqshift.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #define MAX_NB_COEFFS 16 diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index 6ccce2d7de..0150fd2d86 100644 --- a/libavfilter/af_alimiter.c +++ b/libavfilter/af_alimiter.c @@ -32,6 +32,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct MetaItem { diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index b85190db34..f50d0a034a 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c index 257dba1a41..3ff45aa40f 100644 --- a/libavfilter/af_anull.c +++ b/libavfilter/af_anull.c @@ -24,6 +24,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "libavutil/internal.h" diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c index f3334aa2c4..7ed7d53bff 100644 --- a/libavfilter/af_aphaser.c +++ b/libavfilter/af_aphaser.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "generate_wave_table.h" diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c index e471936d16..6774e90607 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 "filters.h" #include "formats.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_asetrate.c b/libavfilter/af_asetrate.c index 50ccfc91b9..7510fc7c31 100644 --- a/libavfilter/af_asetrate.c +++ b/libavfilter/af_asetrate.c @@ -20,6 +20,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_asoftclip.c b/libavfilter/af_asoftclip.c index e6483c439c..232ed05c01 100644 --- a/libavfilter/af_asoftclip.c +++ b/libavfilter/af_asoftclip.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #define MAX_OVERSAMPLE 64 diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c index 9d3c88f2a0..dd95745179 100644 --- a/libavfilter/af_asr.c +++ b/libavfilter/af_asr.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index c7e7c11b7d..dcdeff175d 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #define HISTOGRAM_SIZE 8192 diff --git a/libavfilter/af_asubboost.c b/libavfilter/af_asubboost.c index f559895418..5698f50287 100644 --- a/libavfilter/af_asubboost.c +++ b/libavfilter/af_asubboost.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" typedef struct ASubBoostContext { const AVClass *class; diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index 848388c520..76e9d4b969 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" typedef struct BiquadCoeffs { double a1, a2; diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 3658348c45..c3f87db05e 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -47,6 +47,7 @@ #include "libavutil/tx.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "internal.h" /** diff --git a/libavfilter/af_atilt.c b/libavfilter/af_atilt.c index 172e3259db..c8f4ba1e94 100644 --- a/libavfilter/af_atilt.c +++ b/libavfilter/af_atilt.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #define MAX_ORDER 30 diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c index ebd50d4d77..e8c1a6ab88 100644 --- a/libavfilter/af_bs2b.c +++ b/libavfilter/af_bs2b.c @@ -29,6 +29,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 0429490d9f..4c7c269ae7 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -35,6 +35,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c index 72dc8915d7..a53977b417 100644 --- a/libavfilter/af_chorus.c +++ b/libavfilter/af_chorus.c @@ -34,6 +34,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "generate_wave_table.h" diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 880ee6241a..527b2260b4 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -35,6 +35,7 @@ #include "libavutil/samplefmt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct ChanParam { diff --git a/libavfilter/af_compensationdelay.c b/libavfilter/af_compensationdelay.c index 924ccefe94..1236a6ae8c 100644 --- a/libavfilter/af_compensationdelay.c +++ b/libavfilter/af_compensationdelay.c @@ -23,6 +23,7 @@ #include "libavutil/samplefmt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "internal.h" typedef struct CompensationDelayContext { diff --git a/libavfilter/af_crystalizer.c b/libavfilter/af_crystalizer.c index 01cdf8bd63..f7f4b063bf 100644 --- a/libavfilter/af_crystalizer.c +++ b/libavfilter/af_crystalizer.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" typedef struct CrystalizerContext { const AVClass *class; diff --git a/libavfilter/af_dcshift.c b/libavfilter/af_dcshift.c index 3e9ba7e528..784bba0fe0 100644 --- a/libavfilter/af_dcshift.c +++ b/libavfilter/af_dcshift.c @@ -23,6 +23,7 @@ #include "libavutil/samplefmt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "internal.h" typedef struct DCShiftContext { diff --git a/libavfilter/af_deesser.c b/libavfilter/af_deesser.c index 917ef2f43f..b5fad9789b 100644 --- a/libavfilter/af_deesser.c +++ b/libavfilter/af_deesser.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" typedef struct DeesserChannel { double s1, s2, s3; diff --git a/libavfilter/af_drmeter.c b/libavfilter/af_drmeter.c index 0decc0fde6..3292736a9a 100644 --- a/libavfilter/af_drmeter.c +++ b/libavfilter/af_drmeter.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #define BINS 32768 diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c index 38ff9c1f3f..cd19ac421e 100644 --- a/libavfilter/af_earwax.c +++ b/libavfilter/af_earwax.c @@ -32,6 +32,7 @@ #include "libavutil/channel_layout.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" #define NUMTAPS 32 diff --git a/libavfilter/af_extrastereo.c b/libavfilter/af_extrastereo.c index 2b1b09f9c2..6563b39402 100644 --- a/libavfilter/af_extrastereo.c +++ b/libavfilter/af_extrastereo.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" typedef struct ExtraStereoContext { diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c index 381cf96649..add1e9e9ad 100644 --- a/libavfilter/af_flanger.c +++ b/libavfilter/af_flanger.c @@ -23,6 +23,7 @@ #include "libavutil/samplefmt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "internal.h" #include "generate_wave_table.h" diff --git a/libavfilter/af_haas.c b/libavfilter/af_haas.c index 753a3505e5..6385b328e4 100644 --- a/libavfilter/af_haas.c +++ b/libavfilter/af_haas.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" #define MAX_HAAS_DELAY 40 diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index 27f35dd196..90831d5b2a 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 "filters.h" #include "formats.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c index 547e91979d..cb90b8f5ae 100644 --- a/libavfilter/af_ladspa.c +++ b/libavfilter/af_ladspa.c @@ -34,6 +34,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index e63820efce..60b21c12dc 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -35,6 +35,7 @@ #include "libavutil/samplefmt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct CompandSegment { diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index da32977c99..501cb4b7fa 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -35,6 +35,7 @@ #include "libswresample/swresample.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index 1d2bf03f72..a481f40dfa 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -30,6 +30,7 @@ #include "libavutil/timestamp.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct SilenceDetectContext { diff --git a/libavfilter/af_stereotools.c b/libavfilter/af_stereotools.c index 70d14ebe17..934c5d33aa 100644 --- a/libavfilter/af_stereotools.c +++ b/libavfilter/af_stereotools.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" typedef struct StereoToolsContext { diff --git a/libavfilter/af_stereowiden.c b/libavfilter/af_stereowiden.c index 96d77cd2ac..6718bb39a5 100644 --- a/libavfilter/af_stereowiden.c +++ b/libavfilter/af_stereowiden.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" typedef struct StereoWidenContext { diff --git a/libavfilter/af_tremolo.c b/libavfilter/af_tremolo.c index 30e35935b4..ae2ba77a37 100644 --- a/libavfilter/af_tremolo.c +++ b/libavfilter/af_tremolo.c @@ -21,6 +21,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "audio.h" diff --git a/libavfilter/af_vibrato.c b/libavfilter/af_vibrato.c index 3d709d561e..a135490df8 100644 --- a/libavfilter/af_vibrato.c +++ b/libavfilter/af_vibrato.c @@ -21,6 +21,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "audio.h" #include "generate_wave_table.h" diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c index 8b001d1cf2..a2cf5db637 100644 --- a/libavfilter/af_volumedetect.c +++ b/libavfilter/af_volumedetect.c @@ -22,6 +22,7 @@ #include "libavutil/avassert.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct VolDetectContext { diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c index 64a733e165..162f951d23 100644 --- a/libavfilter/asink_anullsink.c +++ b/libavfilter/asink_anullsink.c @@ -20,6 +20,7 @@ #include "libavutil/internal.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" static int null_filter_frame(AVFilterLink *link, AVFrame *frame) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 22f64d1733..1768b31184 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -27,6 +27,7 @@ #include "audio.h" #include "avfilter.h" #include "avfilter_internal.h" +#include "filters.h" #include "framepool.h" #include "internal.h" diff --git a/libavfilter/audio.h b/libavfilter/audio.h index be90fa347b..aab80baa50 100644 --- a/libavfilter/audio.h +++ b/libavfilter/audio.h @@ -23,7 +23,7 @@ #define AVFILTER_AUDIO_H #include "avfilter.h" -#include "internal.h" +#include "filters.h" /** * An AVFilterPad array whose only entry has name "default" diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 6bfcc42430..0da2f8462b 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -36,6 +36,7 @@ #include "avfilter.h" #include "avfilter_internal.h" #include "buffersink.h" +#include "filters.h" #include "formats.h" #include "framequeue.h" #include "internal.h" diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index 8dec3b671a..abd07d8de1 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -27,6 +27,8 @@ #include "libavutil/avassert.h" #include "libavutil/mem.h" #include "libavutil/opt.h" + +#include "libavfilter/filters.h" #include "libavfilter/internal.h" extern const DNNModule ff_dnn_backend_openvino; diff --git a/libavfilter/f_bench.c b/libavfilter/f_bench.c index a9bcd2149c..0e60b40c43 100644 --- a/libavfilter/f_bench.c +++ b/libavfilter/f_bench.c @@ -22,6 +22,7 @@ #include "libavutil/time.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c index 83793bbe15..319be8dd10 100644 --- a/libavfilter/f_realtime.c +++ b/libavfilter/f_realtime.c @@ -24,6 +24,7 @@ #include "libavutil/time.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index 71ef30f9b5..0eee7c2588 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -22,6 +22,7 @@ #include "libavutil/mem.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #define DEFAULT_LENGTH 300 diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index 616fd0750c..2d0c080c3e 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/f_zmq.c b/libavfilter/f_zmq.c index 03c6c65c93..aa5c692b62 100644 --- a/libavfilter/f_zmq.c +++ b/libavfilter/f_zmq.c @@ -30,6 +30,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "audio.h" #include "video.h" diff --git a/libavfilter/filters.h b/libavfilter/filters.h index ab16047e12..e78029a1b7 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -33,6 +33,92 @@ */ #define FFERROR_NOT_READY FFERRTAG('N','R','D','Y') +/** + * A filter pad used for either input or output. + */ +struct AVFilterPad { + /** + * Pad name. The name is unique among inputs and among outputs, but an + * input may have the same name as an output. This may be NULL if this + * pad has no need to ever be referenced by name. + */ + const char *name; + + /** + * AVFilterPad type. + */ + enum AVMediaType type; + + /** + * The filter expects writable frames from its input link, + * duplicating data buffers if needed. + * + * input pads only. + */ +#define AVFILTERPAD_FLAG_NEEDS_WRITABLE (1 << 0) + + /** + * The pad's name is allocated and should be freed generically. + */ +#define AVFILTERPAD_FLAG_FREE_NAME (1 << 1) + + /** + * A combination of AVFILTERPAD_FLAG_* flags. + */ + int flags; + + /** + * Callback functions to get a video/audio buffers. If NULL, + * the filter system will use ff_default_get_video_buffer() for video + * and ff_default_get_audio_buffer() for audio. + * + * The state of the union is determined by type. + * + * Input pads only. + */ + union { + AVFrame *(*video)(AVFilterLink *link, int w, int h); + AVFrame *(*audio)(AVFilterLink *link, int nb_samples); + } get_buffer; + + /** + * Filtering callback. This is where a filter receives a frame with + * audio/video data and should do its processing. + * + * Input pads only. + * + * @return >= 0 on success, a negative AVERROR on error. This function + * must ensure that frame is properly unreferenced on error if it + * hasn't been passed on to another filter. + */ + int (*filter_frame)(AVFilterLink *link, AVFrame *frame); + + /** + * Frame request callback. A call to this should result in some progress + * towards producing output over the given link. This should return zero + * on success, and another value on error. + * + * Output pads only. + */ + int (*request_frame)(AVFilterLink *link); + + /** + * Link configuration callback. + * + * For output pads, this should set the link properties such as + * width/height. This should NOT set the format property - that is + * negotiated between filters by the filter system using the + * query_formats() callback before this function is called. + * + * For input pads, this should check the properties of the link, and update + * the filter's internal state as necessary. + * + * For both input and output filters, this should return zero on success, + * and another value on error. + */ + int (*config_props)(AVFilterLink *link); +}; + /** * Link properties exposed to filter code, but not external callers. * @@ -114,6 +200,98 @@ static inline FilterLink* ff_filter_link(AVFilterLink *link) return (FilterLink*)link; } +typedef struct FFFilterContext { + /** + * The public AVFilterContext. See avfilter.h for it. + */ + AVFilterContext p; + + avfilter_execute_func *execute; + + // 1 when avfilter_init_*() was successfully called on this filter + // 0 otherwise + int initialized; +} FFFilterContext; + +static inline FFFilterContext *fffilterctx(AVFilterContext *ctx) +{ + return (FFFilterContext*)ctx; +} + +/** + * The filter is aware of hardware frames, and any hardware frame context + * should not be automatically propagated through it. + */ +#define FF_FILTER_FLAG_HWFRAME_AWARE (1 << 0) + +/** + * Find the index of a link. + * + * I.e. find i such that link == ctx->(in|out)puts[i] + */ +#define FF_INLINK_IDX(link) ((int)((link)->dstpad - (link)->dst->input_pads)) +#define FF_OUTLINK_IDX(link) ((int)((link)->srcpad - (link)->src->output_pads)) + +enum FilterFormatsState { + /** + * The default value meaning that this filter supports all formats + * and (for audio) sample rates and channel layouts/counts as long + * as these properties agree for all inputs and outputs. + * This state is only allowed in case all inputs and outputs actually + * have the same type. + * The union is unused in this state. + * + * This value must always be zero (for default static initialization). + */ + FF_FILTER_FORMATS_PASSTHROUGH = 0, + FF_FILTER_FORMATS_QUERY_FUNC, ///< formats.query active. + FF_FILTER_FORMATS_PIXFMT_LIST, ///< formats.pixels_list active. + FF_FILTER_FORMATS_SAMPLEFMTS_LIST, ///< formats.samples_list active. + FF_FILTER_FORMATS_SINGLE_PIXFMT, ///< formats.pix_fmt active + FF_FILTER_FORMATS_SINGLE_SAMPLEFMT, ///< formats.sample_fmt active. +}; + +#define FILTER_QUERY_FUNC(func) \ + .formats.query_func = func, \ + .formats_state = FF_FILTER_FORMATS_QUERY_FUNC +#define FILTER_PIXFMTS_ARRAY(array) \ + .formats.pixels_list = array, \ + .formats_state = FF_FILTER_FORMATS_PIXFMT_LIST +#define FILTER_SAMPLEFMTS_ARRAY(array) \ + .formats.samples_list = array, \ + .formats_state = FF_FILTER_FORMATS_SAMPLEFMTS_LIST +#define FILTER_PIXFMTS(...) \ + FILTER_PIXFMTS_ARRAY(((const enum AVPixelFormat []) { __VA_ARGS__, AV_PIX_FMT_NONE })) +#define FILTER_SAMPLEFMTS(...) \ + FILTER_SAMPLEFMTS_ARRAY(((const enum AVSampleFormat[]) { __VA_ARGS__, AV_SAMPLE_FMT_NONE })) +#define FILTER_SINGLE_PIXFMT(pix_fmt_) \ + .formats.pix_fmt = pix_fmt_, \ + .formats_state = FF_FILTER_FORMATS_SINGLE_PIXFMT +#define FILTER_SINGLE_SAMPLEFMT(sample_fmt_) \ + .formats.sample_fmt = sample_fmt_, \ + .formats_state = FF_FILTER_FORMATS_SINGLE_SAMPLEFMT + +#define FILTER_INOUTPADS(inout, array) \ + .inout = array, \ + .nb_ ## inout = FF_ARRAY_ELEMS(array) +#define FILTER_INPUTS(array) FILTER_INOUTPADS(inputs, (array)) +#define FILTER_OUTPUTS(array) FILTER_INOUTPADS(outputs, (array)) + +#define AVFILTER_DEFINE_CLASS_EXT(name, desc, options) \ + static const AVClass name##_class = { \ + .class_name = desc, \ + .item_name = av_default_item_name, \ + .option = options, \ + .version = LIBAVUTIL_VERSION_INT, \ + .category = AV_CLASS_CATEGORY_FILTER, \ + } +#define AVFILTER_DEFINE_CLASS(fname) \ + AVFILTER_DEFINE_CLASS_EXT(fname, #fname, fname##_options) + +#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) +#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) +#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) + /** * Mark a filter ready and schedule it for activation. * @@ -257,6 +435,15 @@ int ff_outlink_frame_wanted(AVFilterLink *link); */ int ff_outlink_get_status(AVFilterLink *link); +/** + * Set the status field of a link from the source filter. + * The pts should reflect the timestamp of the status change, + * in link time base and relative to the frames timeline. + * In particular, for AVERROR_EOF, it should reflect the + * end time of the last frame. + */ +void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts); + /** * Set the status field of a link from the source filter. * The pts should reflect the timestamp of the status change, @@ -344,4 +531,109 @@ static inline void ff_outlink_set_status(AVFilterLink *link, int status, int64_t */ int ff_inoutlink_check_flow(AVFilterLink *inlink, AVFilterLink *outlink); +/** + * Perform any additional setup required for hardware frames. + * + * link->hw_frames_ctx must be set before calling this function. + * Inside link->hw_frames_ctx, the fields format, sw_format, width and + * height must be set. If dynamically allocated pools are not supported, + * then initial_pool_size must also be set, to the minimum hardware frame + * pool size necessary for the filter to work (taking into account any + * frames which need to stored for use in operations as appropriate). If + * default_pool_size is nonzero, then it will be used as the pool size if + * no other modification takes place (this can be used to preserve + * compatibility). + */ +int ff_filter_init_hw_frames(AVFilterContext *avctx, AVFilterLink *link, + int default_pool_size); + +/** + * Generic processing of user supplied commands that are set + * in the same way as the filter options. + * NOTE: 'enable' option is handled separately, and not by + * this function. + */ +int ff_filter_process_command(AVFilterContext *ctx, const char *cmd, + const char *arg, char *res, int res_len, int flags); + +/** + * Get number of threads for current filter instance. + * This number is always same or less than graph->nb_threads. + */ +int ff_filter_get_nb_threads(AVFilterContext *ctx) av_pure; + +/** + * Send a frame of data to the next filter. + * + * @param link the output link over which the data is being sent + * @param frame a reference to the buffer of data being sent. The + * receiving filter will free this reference when it no longer + * needs it or pass it on to the next filter. + * + * @return >= 0 on success, a negative AVERROR on error. The receiving filter + * is responsible for unreferencing frame in case of error. + */ +int ff_filter_frame(AVFilterLink *link, AVFrame *frame); + +/** + * Request an input frame from the filter at the other end of the link. + * + * This function must not be used by filters using the activate callback, + * use ff_link_set_frame_wanted() instead. + * + * The input filter may pass the request on to its inputs, fulfill the + * request from an internal buffer or any other means specific to its function. + * + * When the end of a stream is reached AVERROR_EOF is returned and no further + * frames are returned after that. + * + * When a filter is unable to output a frame for example due to its sources + * being unable to do so or because it depends on external means pushing data + * into it then AVERROR(EAGAIN) is returned. + * It is important that a AVERROR(EAGAIN) return is returned all the way to the + * caller (generally eventually a user application) as this step may (but does + * not have to be) necessary to provide the input with the next frame. + * + * If a request is successful then some progress has been made towards + * providing a frame on the link (through ff_filter_frame()). A filter that + * needs several frames to produce one is allowed to return success if one + * more frame has been processed but no output has been produced yet. A + * filter is also allowed to simply forward a success return value. + * + * @param link the input link + * @return zero on success + * AVERROR_EOF on end of file + * AVERROR(EAGAIN) if the previous filter cannot output a frame + * currently and can neither guarantee that EOF has been reached. + */ +int ff_request_frame(AVFilterLink *link); + +/** + * Append a new input/output pad to the filter's list of such pads. + * + * The *_free_name versions will set the AVFILTERPAD_FLAG_FREE_NAME flag + * ensuring that the name will be freed generically (even on insertion error). + */ +int ff_append_inpad (AVFilterContext *f, AVFilterPad *p); +int ff_append_outpad(AVFilterContext *f, AVFilterPad *p); +int ff_append_inpad_free_name (AVFilterContext *f, AVFilterPad *p); +int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p); + +/** + * Tell if an integer is contained in the provided -1-terminated list of integers. + * This is useful for determining (for instance) if an AVPixelFormat is in an + * array of supported formats. + * + * @param fmt provided format + * @param fmts -1-terminated list of formats + * @return 1 if present, 0 if absent + */ +int ff_fmt_is_in(int fmt, const int *fmts); + +static av_always_inline int ff_filter_execute(AVFilterContext *ctx, avfilter_action_func *func, + void *arg, int *ret, int nb_jobs) +{ + return fffilterctx(ctx)->execute(ctx, func, arg, ret, nb_jobs); +} + #endif /* AVFILTER_FILTERS_H */ diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 857f93113d..15099ac545 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -26,6 +26,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "formats.h" diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c index 20370f360f..a13f6981d0 100644 --- a/libavfilter/graphdump.c +++ b/libavfilter/graphdump.c @@ -26,6 +26,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" static int print_link_prop(AVBPrint *buf, AVFilterLink *link) diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 5d6dcdb9d3..81267364bd 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -30,6 +30,7 @@ #include "avfilter.h" #include "avfilter_internal.h" +#include "filters.h" #include "internal.h" #define WHITESPACES " \n\t\r" diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 000f94cb16..4938612593 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -27,172 +27,6 @@ #include "libavutil/internal.h" #include "avfilter.h" -/** - * A filter pad used for either input or output. - */ -struct AVFilterPad { - /** - * Pad name. The name is unique among inputs and among outputs, but an - * input may have the same name as an output. This may be NULL if this - * pad has no need to ever be referenced by name. - */ - const char *name; - - /** - * AVFilterPad type. - */ - enum AVMediaType type; - - /** - * The filter expects writable frames from its input link, - * duplicating data buffers if needed. - * - * input pads only. - */ -#define AVFILTERPAD_FLAG_NEEDS_WRITABLE (1 << 0) - - /** - * The pad's name is allocated and should be freed generically. - */ -#define AVFILTERPAD_FLAG_FREE_NAME (1 << 1) - - /** - * A combination of AVFILTERPAD_FLAG_* flags. - */ - int flags; - - /** - * Callback functions to get a video/audio buffers. If NULL, - * the filter system will use ff_default_get_video_buffer() for video - * and ff_default_get_audio_buffer() for audio. - * - * The state of the union is determined by type. - * - * Input pads only. - */ - union { - AVFrame *(*video)(AVFilterLink *link, int w, int h); - AVFrame *(*audio)(AVFilterLink *link, int nb_samples); - } get_buffer; - - /** - * Filtering callback. This is where a filter receives a frame with - * audio/video data and should do its processing. - * - * Input pads only. - * - * @return >= 0 on success, a negative AVERROR on error. This function - * must ensure that frame is properly unreferenced on error if it - * hasn't been passed on to another filter. - */ - int (*filter_frame)(AVFilterLink *link, AVFrame *frame); - - /** - * Frame request callback. A call to this should result in some progress - * towards producing output over the given link. This should return zero - * on success, and another value on error. - * - * Output pads only. - */ - int (*request_frame)(AVFilterLink *link); - - /** - * Link configuration callback. - * - * For output pads, this should set the link properties such as - * width/height. This should NOT set the format property - that is - * negotiated between filters by the filter system using the - * query_formats() callback before this function is called. - * - * For input pads, this should check the properties of the link, and update - * the filter's internal state as necessary. - * - * For both input and output filters, this should return zero on success, - * and another value on error. - */ - int (*config_props)(AVFilterLink *link); -}; - -typedef struct FFFilterContext { - /** - * The public AVFilterContext. See avfilter.h for it. - */ - AVFilterContext p; - - avfilter_execute_func *execute; - - // 1 when avfilter_init_*() was successfully called on this filter - // 0 otherwise - int initialized; -} FFFilterContext; - -static inline FFFilterContext *fffilterctx(AVFilterContext *ctx) -{ - return (FFFilterContext*)ctx; -} - -static av_always_inline int ff_filter_execute(AVFilterContext *ctx, avfilter_action_func *func, - void *arg, int *ret, int nb_jobs) -{ - return fffilterctx(ctx)->execute(ctx, func, arg, ret, nb_jobs); -} - -enum FilterFormatsState { - /** - * The default value meaning that this filter supports all formats - * and (for audio) sample rates and channel layouts/counts as long - * as these properties agree for all inputs and outputs. - * This state is only allowed in case all inputs and outputs actually - * have the same type. - * The union is unused in this state. - * - * This value must always be zero (for default static initialization). - */ - FF_FILTER_FORMATS_PASSTHROUGH = 0, - FF_FILTER_FORMATS_QUERY_FUNC, ///< formats.query active. - FF_FILTER_FORMATS_PIXFMT_LIST, ///< formats.pixels_list active. - FF_FILTER_FORMATS_SAMPLEFMTS_LIST, ///< formats.samples_list active. - FF_FILTER_FORMATS_SINGLE_PIXFMT, ///< formats.pix_fmt active - FF_FILTER_FORMATS_SINGLE_SAMPLEFMT, ///< formats.sample_fmt active. -}; - -#define FILTER_QUERY_FUNC(func) \ - .formats.query_func = func, \ - .formats_state = FF_FILTER_FORMATS_QUERY_FUNC -#define FILTER_PIXFMTS_ARRAY(array) \ - .formats.pixels_list = array, \ - .formats_state = FF_FILTER_FORMATS_PIXFMT_LIST -#define FILTER_SAMPLEFMTS_ARRAY(array) \ - .formats.samples_list = array, \ - .formats_state = FF_FILTER_FORMATS_SAMPLEFMTS_LIST -#define FILTER_PIXFMTS(...) \ - FILTER_PIXFMTS_ARRAY(((const enum AVPixelFormat []) { __VA_ARGS__, AV_PIX_FMT_NONE })) -#define FILTER_SAMPLEFMTS(...) \ - FILTER_SAMPLEFMTS_ARRAY(((const enum AVSampleFormat[]) { __VA_ARGS__, AV_SAMPLE_FMT_NONE })) -#define FILTER_SINGLE_PIXFMT(pix_fmt_) \ - .formats.pix_fmt = pix_fmt_, \ - .formats_state = FF_FILTER_FORMATS_SINGLE_PIXFMT -#define FILTER_SINGLE_SAMPLEFMT(sample_fmt_) \ - .formats.sample_fmt = sample_fmt_, \ - .formats_state = FF_FILTER_FORMATS_SINGLE_SAMPLEFMT - -#define FILTER_INOUTPADS(inout, array) \ - .inout = array, \ - .nb_ ## inout = FF_ARRAY_ELEMS(array) -#define FILTER_INPUTS(array) FILTER_INOUTPADS(inputs, (array)) -#define FILTER_OUTPUTS(array) FILTER_INOUTPADS(outputs, (array)) - -/** - * Tell if an integer is contained in the provided -1-terminated list of integers. - * This is useful for determining (for instance) if an AVPixelFormat is in an - * array of supported formats. - * - * @param fmt provided format - * @param fmts -1-terminated list of formats - * @return 1 if present, 0 if absent - */ -int ff_fmt_is_in(int fmt, const int *fmts); - /** * Returns true if a pixel format is "regular YUV", which includes all pixel * formats that are affected by YUV colorspace negotiation. @@ -237,15 +71,6 @@ av_warn_unused_result int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, void *log_ctx); -/** - * Set the status field of a link from the source filter. - * The pts should reflect the timestamp of the status change, - * in link time base and relative to the frames timeline. - * In particular, for AVERROR_EOF, it should reflect the - * end time of the last frame. - */ -void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts); - /** * Negotiate the media format, dimensions, etc of all inputs to a filter. * @@ -254,10 +79,6 @@ void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts) */ int ff_filter_config_links(AVFilterContext *filter); -#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) -#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) -#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) - /* misc trace functions */ #define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func) @@ -268,122 +89,9 @@ void ff_tlog_link(void *ctx, AVFilterLink *link, int end); #define ff_tlog_link(ctx, link, end) do { } while(0) #endif -/** - * Append a new input/output pad to the filter's list of such pads. - * - * The *_free_name versions will set the AVFILTERPAD_FLAG_FREE_NAME flag - * ensuring that the name will be freed generically (even on insertion error). - */ -int ff_append_inpad (AVFilterContext *f, AVFilterPad *p); -int ff_append_outpad(AVFilterContext *f, AVFilterPad *p); -int ff_append_inpad_free_name (AVFilterContext *f, AVFilterPad *p); -int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p); - -/** - * Request an input frame from the filter at the other end of the link. - * - * This function must not be used by filters using the activate callback, - * use ff_link_set_frame_wanted() instead. - * - * The input filter may pass the request on to its inputs, fulfill the - * request from an internal buffer or any other means specific to its function. - * - * When the end of a stream is reached AVERROR_EOF is returned and no further - * frames are returned after that. - * - * When a filter is unable to output a frame for example due to its sources - * being unable to do so or because it depends on external means pushing data - * into it then AVERROR(EAGAIN) is returned. - * It is important that a AVERROR(EAGAIN) return is returned all the way to the - * caller (generally eventually a user application) as this step may (but does - * not have to be) necessary to provide the input with the next frame. - * - * If a request is successful then some progress has been made towards - * providing a frame on the link (through ff_filter_frame()). A filter that - * needs several frames to produce one is allowed to return success if one - * more frame has been processed but no output has been produced yet. A - * filter is also allowed to simply forward a success return value. - * - * @param link the input link - * @return zero on success - * AVERROR_EOF on end of file - * AVERROR(EAGAIN) if the previous filter cannot output a frame - * currently and can neither guarantee that EOF has been reached. - */ -int ff_request_frame(AVFilterLink *link); - -#define AVFILTER_DEFINE_CLASS_EXT(name, desc, options) \ - static const AVClass name##_class = { \ - .class_name = desc, \ - .item_name = av_default_item_name, \ - .option = options, \ - .version = LIBAVUTIL_VERSION_INT, \ - .category = AV_CLASS_CATEGORY_FILTER, \ - } -#define AVFILTER_DEFINE_CLASS(fname) \ - AVFILTER_DEFINE_CLASS_EXT(fname, #fname, fname##_options) - -/** - * Find the index of a link. - * - * I.e. find i such that link == ctx->(in|out)puts[i] - */ -#define FF_INLINK_IDX(link) ((int)((link)->dstpad - (link)->dst->input_pads)) -#define FF_OUTLINK_IDX(link) ((int)((link)->srcpad - (link)->src->output_pads)) - -/** - * Send a frame of data to the next filter. - * - * @param link the output link over which the data is being sent - * @param frame a reference to the buffer of data being sent. The - * receiving filter will free this reference when it no longer - * needs it or pass it on to the next filter. - * - * @return >= 0 on success, a negative AVERROR on error. The receiving filter - * is responsible for unreferencing frame in case of error. - */ -int ff_filter_frame(AVFilterLink *link, AVFrame *frame); - -/** - * The filter is aware of hardware frames, and any hardware frame context - * should not be automatically propagated through it. - */ -#define FF_FILTER_FLAG_HWFRAME_AWARE (1 << 0) - /** * Run one round of processing on a filter graph. */ int ff_filter_graph_run_once(AVFilterGraph *graph); -/** - * Get number of threads for current filter instance. - * This number is always same or less than graph->nb_threads. - */ -int ff_filter_get_nb_threads(AVFilterContext *ctx) av_pure; - -/** - * Generic processing of user supplied commands that are set - * in the same way as the filter options. - * NOTE: 'enable' option is handled separately, and not by - * this function. - */ -int ff_filter_process_command(AVFilterContext *ctx, const char *cmd, - const char *arg, char *res, int res_len, int flags); - -/** - * Perform any additional setup required for hardware frames. - * - * link->hw_frames_ctx must be set before calling this function. - * Inside link->hw_frames_ctx, the fields format, sw_format, width and - * height must be set. If dynamically allocated pools are not supported, - * then initial_pool_size must also be set, to the minimum hardware frame - * pool size necessary for the filter to work (taking into account any - * frames which need to stored for use in operations as appropriate). If - * default_pool_size is nonzero, then it will be used as the pool size if - * no other modification takes place (this can be used to preserve - * compatibility). - */ -int ff_filter_init_hw_frames(AVFilterContext *avctx, AVFilterLink *link, - int default_pool_size); - #endif /* AVFILTER_INTERNAL_H */ diff --git a/libavfilter/vf_addroi.c b/libavfilter/vf_addroi.c index e7ad916214..a07be2b426 100644 --- a/libavfilter/vf_addroi.c +++ b/libavfilter/vf_addroi.c @@ -20,6 +20,7 @@ #include "libavutil/eval.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c index 7f2cf81150..0c0e15bde4 100644 --- a/libavfilter/vf_amplify.c +++ b/libavfilter/vf_amplify.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 129ae19d6d..e43a1c7c89 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -35,6 +35,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_atadenoise.c b/libavfilter/vf_atadenoise.c index da132db1b6..81ca644575 100644 --- a/libavfilter/vf_atadenoise.c +++ b/libavfilter/vf_atadenoise.c @@ -34,6 +34,7 @@ #include "bufferqueue.h" #include "atadenoise.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index cbaeb974e5..b51c19dd79 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_avgblur_opencl.c b/libavfilter/vf_avgblur_opencl.c index ad68b8be38..07be4b574c 100644 --- a/libavfilter/vf_avgblur_opencl.c +++ b/libavfilter/vf_avgblur_opencl.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 6bc1b616a6..7599f251b0 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -22,6 +22,8 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_backgroundkey.c b/libavfilter/vf_backgroundkey.c index 54f7621a10..444ec30600 100644 --- a/libavfilter/vf_backgroundkey.c +++ b/libavfilter/vf_backgroundkey.c @@ -20,6 +20,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_bilateral.c b/libavfilter/vf_bilateral.c index 3fe7e69b9f..010c291dfc 100644 --- a/libavfilter/vf_bilateral.c +++ b/libavfilter/vf_bilateral.c @@ -26,6 +26,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_bitplanenoise.c b/libavfilter/vf_bitplanenoise.c index 32235ff230..92ba1aa49b 100644 --- a/libavfilter/vf_bitplanenoise.c +++ b/libavfilter/vf_bitplanenoise.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 10062c995c..8d945f89a1 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -33,6 +33,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index 669b32afd8..0a1920b12b 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -29,6 +29,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index b8759d8243..7b6557b2a9 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -34,6 +34,7 @@ #include "avfilter.h" #include "bwdifdsp.h" #include "ccfifo.h" +#include "filters.h" #include "internal.h" #include "yadif.h" diff --git a/libavfilter/vf_cas.c b/libavfilter/vf_cas.c index 5fa5055d76..ed5e8fec34 100644 --- a/libavfilter/vf_cas.c +++ b/libavfilter/vf_cas.c @@ -19,6 +19,7 @@ #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_chromaber_vulkan.c b/libavfilter/vf_chromaber_vulkan.c index 0b96a7400f..39be1feb8c 100644 --- a/libavfilter/vf_chromaber_vulkan.c +++ b/libavfilter/vf_chromaber_vulkan.c @@ -22,6 +22,8 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index 9c0918bb4d..5671cf2ae8 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct ChromakeyContext { diff --git a/libavfilter/vf_chromanr.c b/libavfilter/vf_chromanr.c index ff77313311..ddf3ce30ca 100644 --- a/libavfilter/vf_chromanr.c +++ b/libavfilter/vf_chromanr.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index 6c929472a7..ea07ac071f 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index d5f33a530e..3eed4b22fc 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -25,6 +25,7 @@ #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index 3cbe3ee2bd..bd82624d87 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -35,6 +35,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/video_enc_params.h" #include "avfilter.h" +#include "filters.h" #include "qp_table.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorbalance.c b/libavfilter/vf_colorbalance.c index 676e74c770..8561763a85 100644 --- a/libavfilter/vf_colorbalance.c +++ b/libavfilter/vf_colorbalance.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c index 006a8ee289..f74b07af56 100644 --- a/libavfilter/vf_colorchannelmixer.c +++ b/libavfilter/vf_colorchannelmixer.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "preserve_color.h" diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index f638ec0dc6..1c15afb80f 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorcontrast.c b/libavfilter/vf_colorcontrast.c index b086de71e5..f675924171 100644 --- a/libavfilter/vf_colorcontrast.c +++ b/libavfilter/vf_colorcontrast.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorcorrect.c b/libavfilter/vf_colorcorrect.c index d86d9f1927..acc654fb23 100644 --- a/libavfilter/vf_colorcorrect.c +++ b/libavfilter/vf_colorcorrect.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorize.c b/libavfilter/vf_colorize.c index e6c563e3e2..dfad9191ed 100644 --- a/libavfilter/vf_colorize.c +++ b/libavfilter/vf_colorize.c @@ -19,6 +19,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index 58dd513b31..ce7227f4a8 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" typedef struct ColorkeyContext { diff --git a/libavfilter/vf_colorkey_opencl.c b/libavfilter/vf_colorkey_opencl.c index 72a36df2d3..d1c877521a 100644 --- a/libavfilter/vf_colorkey_opencl.c +++ b/libavfilter/vf_colorkey_opencl.c @@ -18,6 +18,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c index 6f54628ec5..728e5048f3 100644 --- a/libavfilter/vf_colorlevels.c +++ b/libavfilter/vf_colorlevels.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "preserve_color.h" diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 81254b0463..03e4f63a25 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -30,6 +30,7 @@ #include #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index 7bacd7892a..68c9419727 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -33,6 +33,7 @@ #include "avfilter.h" #include "colorspacedsp.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_colortemperature.c b/libavfilter/vf_colortemperature.c index b06b04e704..b7de6bb53a 100644 --- a/libavfilter/vf_colortemperature.c +++ b/libavfilter/vf_colortemperature.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index bb78e33d80..5aca907a18 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -30,6 +30,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "convolution.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_convolution_opencl.c b/libavfilter/vf_convolution_opencl.c index 40938436f2..82def57056 100644 --- a/libavfilter/vf_convolution_opencl.c +++ b/libavfilter/vf_convolution_opencl.c @@ -30,6 +30,7 @@ #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index 52ac9fb0ec..54cb12c426 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 "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index 486f723a4b..4912927e51 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -31,6 +31,7 @@ #include "libavutil/qsort.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "edge_common.h" diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 97f284db22..85b493d5ad 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -29,6 +29,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_dblur.c b/libavfilter/vf_dblur.c index 5202c57489..ab8bdbbad4 100644 --- a/libavfilter/vf_dblur.c +++ b/libavfilter/vf_dblur.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c index ef68337816..66fe154010 100644 --- a/libavfilter/vf_dctdnoiz.c +++ b/libavfilter/vf_dctdnoiz.c @@ -33,6 +33,8 @@ #include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_deband.c b/libavfilter/vf_deband.c index 9888285586..013324a766 100644 --- a/libavfilter/vf_deband.c +++ b/libavfilter/vf_deband.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_deblock.c b/libavfilter/vf_deblock.c index 7e4b1799d3..7b6cd04ffc 100644 --- a/libavfilter/vf_deblock.c +++ b/libavfilter/vf_deblock.c @@ -27,6 +27,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_deflicker.c b/libavfilter/vf_deflicker.c index c17a8c8a3b..474f00df35 100644 --- a/libavfilter/vf_deflicker.c +++ b/libavfilter/vf_deflicker.c @@ -28,6 +28,7 @@ #define FF_BUFQUEUE_SIZE 129 #include "bufferqueue.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_derain.c b/libavfilter/vf_derain.c index 5cefca6b55..fa5e073671 100644 --- a/libavfilter/vf_derain.c +++ b/libavfilter/vf_derain.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "dnn_filter_common.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 05a2df652e..33c460c01e 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -50,6 +50,7 @@ */ #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "transform.h" #include "video.h" diff --git a/libavfilter/vf_despill.c b/libavfilter/vf_despill.c index 7e8ccf7fe8..ca9b075f0c 100644 --- a/libavfilter/vf_despill.c +++ b/libavfilter/vf_despill.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct DespillContext { diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 27739dc89f..ac6395fc62 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -36,6 +36,7 @@ #include "libavutil/detection_bbox.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_drawbox_vaapi.c b/libavfilter/vf_drawbox_vaapi.c index 1081d463e9..c3e6e0943d 100644 --- a/libavfilter/vf_drawbox_vaapi.c +++ b/libavfilter/vf_drawbox_vaapi.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index dcf20ab11c..72280c8ba7 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -30,6 +30,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index dd22da07b6..93d416a216 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -31,6 +31,7 @@ #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_entropy.c b/libavfilter/vf_entropy.c index a26cbb19d8..4db3d2b70b 100644 --- a/libavfilter/vf_entropy.c +++ b/libavfilter/vf_entropy.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_epx.c b/libavfilter/vf_epx.c index bae1b898bc..af32e21163 100644 --- a/libavfilter/vf_epx.c +++ b/libavfilter/vf_epx.c @@ -18,6 +18,8 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_exposure.c b/libavfilter/vf_exposure.c index 926d784a81..75be794d00 100644 --- a/libavfilter/vf_exposure.c +++ b/libavfilter/vf_exposure.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index 93d068d046..f525cbf635 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -24,6 +24,8 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/tx.h" + +#include "filters.h" #include "internal.h" #include "video.h" #include "window_func.h" diff --git a/libavfilter/vf_field.c b/libavfilter/vf_field.c index 525f1da4a0..0e981fabf5 100644 --- a/libavfilter/vf_field.c +++ b/libavfilter/vf_field.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" enum FieldType { FIELD_TYPE_TOP = 0, FIELD_TYPE_BOTTOM }; diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 21d62b93f1..82f88f43be 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_fillborders.c b/libavfilter/vf_fillborders.c index 2778cb486b..1bd4e2081f 100644 --- a/libavfilter/vf_fillborders.c +++ b/libavfilter/vf_fillborders.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_flip_vulkan.c b/libavfilter/vf_flip_vulkan.c index ecd2567ebc..bad617d024 100644 --- a/libavfilter/vf_flip_vulkan.c +++ b/libavfilter/vf_flip_vulkan.c @@ -23,6 +23,8 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 3a353bbb0d..2b88b10f65 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -33,6 +33,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index da32326b94..d1945d26ff 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -41,6 +41,8 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" + +#include "filters.h" #include "internal.h" #include "qp_table.h" #include "vf_fspp.h" diff --git a/libavfilter/vf_gblur.c b/libavfilter/vf_gblur.c index 812fad72a3..07e151a0b1 100644 --- a/libavfilter/vf_gblur.c +++ b/libavfilter/vf_gblur.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "gblur.h" #include "internal.h" #include "vf_gblur_init.h" diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c index 09be6015c3..27cac920ec 100644 --- a/libavfilter/vf_gblur_vulkan.c +++ b/libavfilter/vf_gblur_vulkan.c @@ -24,6 +24,8 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index e854e320c6..5a70467a7e 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -40,6 +40,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "gradfun.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_grayworld.c b/libavfilter/vf_grayworld.c index 0b6d673168..60ee444887 100644 --- a/libavfilter/vf_grayworld.c +++ b/libavfilter/vf_grayworld.c @@ -29,6 +29,7 @@ #include "libavutil/mem.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 9f5958a392..769df9e3c0 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -27,6 +27,7 @@ #include #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "hflip.h" #include "internal.h" diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c index 24c95a0249..e714cf2ad2 100644 --- a/libavfilter/vf_histeq.c +++ b/libavfilter/vf_histeq.c @@ -34,6 +34,7 @@ #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 7da6d5d727..697ae21ed3 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -27,6 +27,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 9f32b943c9..0aaa37dfe4 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -38,6 +38,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "vf_hqdn3d.h" diff --git a/libavfilter/vf_hqx.c b/libavfilter/vf_hqx.c index 4a8ed184f4..932313cac1 100644 --- a/libavfilter/vf_hqx.c +++ b/libavfilter/vf_hqx.c @@ -30,6 +30,7 @@ #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c index 0bd8cace37..f0954e0460 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -24,6 +24,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" typedef struct HSVKeyContext { diff --git a/libavfilter/vf_huesaturation.c b/libavfilter/vf_huesaturation.c index bea13deca9..e5891f8b17 100644 --- a/libavfilter/vf_huesaturation.c +++ b/libavfilter/vf_huesaturation.c @@ -20,6 +20,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_iccdetect.c b/libavfilter/vf_iccdetect.c index 16eacbbb56..18a7e2ba9c 100644 --- a/libavfilter/vf_iccdetect.c +++ b/libavfilter/vf_iccdetect.c @@ -30,6 +30,7 @@ #include "avfilter.h" #include "fflcms2.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_iccgen.c b/libavfilter/vf_iccgen.c index aae7ae5d26..8ae1d84161 100644 --- a/libavfilter/vf_iccgen.c +++ b/libavfilter/vf_iccgen.c @@ -29,6 +29,7 @@ #include "avfilter.h" #include "fflcms2.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index abd375230a..197e33f2d2 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -23,6 +23,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" #include "internal.h" +#include "filters.h" #include "vf_idet.h" #define OFFSET(x) offsetof(IDETContext, x) diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c index 5eaa40a6f8..ac79990964 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 "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c index 5baa8d1897..61fa53a5d5 100644 --- a/libavfilter/vf_kerndeint.c +++ b/libavfilter/vf_kerndeint.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_lagfun.c b/libavfilter/vf_lagfun.c index 4d7496c3eb..9d781b9f7f 100644 --- a/libavfilter/vf_lagfun.c +++ b/libavfilter/vf_lagfun.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index 06ab662b5f..c9d4818b06 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -33,6 +33,7 @@ #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index 8a35985b20..237af6e227 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -37,6 +37,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_limiter.c b/libavfilter/vf_limiter.c index f67f590d60..0df104156e 100644 --- a/libavfilter/vf_limiter.c +++ b/libavfilter/vf_limiter.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "limiter.h" #include "video.h" diff --git a/libavfilter/vf_lumakey.c b/libavfilter/vf_lumakey.c index d426a5b67a..ee243dda48 100644 --- a/libavfilter/vf_lumakey.c +++ b/libavfilter/vf_lumakey.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 01df8f287d..7e0abdebc6 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -35,6 +35,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 929bf61b87..9f10502e28 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -35,6 +35,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "lut3d.h" diff --git a/libavfilter/vf_maskfun.c b/libavfilter/vf_maskfun.c index 1ac152fc8b..53c3b91824 100644 --- a/libavfilter/vf_maskfun.c +++ b/libavfilter/vf_maskfun.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 76ab59912e..713df31308 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -52,6 +52,7 @@ #include "libavutil/opt.h" #include "libavcodec/avcodec.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c index 5ed787af5e..c4e3ca400d 100644 --- a/libavfilter/vf_median.c +++ b/libavfilter/vf_median.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "median.h" #include "video.h" diff --git a/libavfilter/vf_mestimate.c b/libavfilter/vf_mestimate.c index 3397109831..842932c17b 100644 --- a/libavfilter/vf_mestimate.c +++ b/libavfilter/vf_mestimate.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/motion_vector.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index d68e18b52b..a007d6aac3 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -21,6 +21,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_monochrome.c b/libavfilter/vf_monochrome.c index 05c001707a..46287781b9 100644 --- a/libavfilter/vf_monochrome.c +++ b/libavfilter/vf_monochrome.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index dab8941e46..c9670f2429 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -29,6 +29,7 @@ #include "libavutil/pixelutils.h" #include "libavutil/timestamp.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_negate.c b/libavfilter/vf_negate.c index 40c0c2608b..b6b5299799 100644 --- a/libavfilter/vf_negate.c +++ b/libavfilter/vf_negate.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index 915347d6ba..d1e5b179b2 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -26,6 +26,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_neighbor_opencl.c b/libavfilter/vf_neighbor_opencl.c index ba661bd665..9d6d1e9e66 100644 --- a/libavfilter/vf_neighbor_opencl.c +++ b/libavfilter/vf_neighbor_opencl.c @@ -28,6 +28,7 @@ #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 64877317ed..968311d03d 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -34,6 +34,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "vf_nlmeans.h" #include "vf_nlmeans_init.h" diff --git a/libavfilter/vf_nlmeans_opencl.c b/libavfilter/vf_nlmeans_opencl.c index 5149be02ca..e5316d04f1 100644 --- a/libavfilter/vf_nlmeans_opencl.c +++ b/libavfilter/vf_nlmeans_opencl.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_nlmeans_vulkan.c b/libavfilter/vf_nlmeans_vulkan.c index be9305854b..96d51548a2 100644 --- a/libavfilter/vf_nlmeans_vulkan.c +++ b/libavfilter/vf_nlmeans_vulkan.c @@ -23,6 +23,8 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index c559c9843d..1d9646cb32 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -31,6 +31,7 @@ #include "libavutil/lfg.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "vf_noise.h" diff --git a/libavfilter/vf_normalize.c b/libavfilter/vf_normalize.c index 337c37f0ab..c713946f9c 100644 --- a/libavfilter/vf_normalize.c +++ b/libavfilter/vf_normalize.c @@ -78,6 +78,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_null.c b/libavfilter/vf_null.c index 1502774f98..af06a340d7 100644 --- a/libavfilter/vf_null.c +++ b/libavfilter/vf_null.c @@ -23,6 +23,7 @@ #include "libavutil/internal.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_ocr.c b/libavfilter/vf_ocr.c index 3cece91edf..f88a1a6e35 100644 --- a/libavfilter/vf_ocr.c +++ b/libavfilter/vf_ocr.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_overlay_opencl.c b/libavfilter/vf_overlay_opencl.c index 9beb09f05a..219d4fef37 100644 --- a/libavfilter/vf_overlay_opencl.c +++ b/libavfilter/vf_overlay_opencl.c @@ -21,6 +21,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "framesync.h" #include "internal.h" #include "opencl.h" diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index c09de24142..233c5a68d6 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -22,6 +22,8 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" + +#include "filters.h" #include "internal.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_owdenoise.c b/libavfilter/vf_owdenoise.c index 9bcab5a75e..4df8f972a8 100644 --- a/libavfilter/vf_owdenoise.c +++ b/libavfilter/vf_owdenoise.c @@ -39,6 +39,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 2cced46f29..584bcc9847 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -27,6 +27,7 @@ #include /* DBL_MAX */ #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_pad_opencl.c b/libavfilter/vf_pad_opencl.c index 7c163a1d0e..a30236d5dd 100644 --- a/libavfilter/vf_pad_opencl.c +++ b/libavfilter/vf_pad_opencl.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_pad_vaapi.c b/libavfilter/vf_pad_vaapi.c index 98f6285222..7b4e45bc1b 100644 --- a/libavfilter/vf_pad_vaapi.c +++ b/libavfilter/vf_pad_vaapi.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 81897a69ec..d29f4b8e2a 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -30,6 +30,7 @@ #include "libavutil/opt.h" #include "libavutil/intreadwrite.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "palette.h" diff --git a/libavfilter/vf_phase.c b/libavfilter/vf_phase.c index 4fd6d2b6e5..a66ed33e3a 100644 --- a/libavfilter/vf_phase.c +++ b/libavfilter/vf_phase.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 02145a327f..c2e9014968 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -27,6 +27,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_pixelize.c b/libavfilter/vf_pixelize.c index 4eb236f121..59c0a659b0 100644 --- a/libavfilter/vf_pixelize.c +++ b/libavfilter/vf_pixelize.c @@ -24,6 +24,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c index 44705789e6..366a35fcf2 100644 --- a/libavfilter/vf_pp.c +++ b/libavfilter/vf_pp.c @@ -28,6 +28,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" +#include "filters.h" #include "internal.h" #include "qp_table.h" #include "video.h" diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index 24b39eebd2..d3baa69d50 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -33,6 +33,8 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" + +#include "filters.h" #include "internal.h" #include "qp_table.h" #include "vf_pp7.h" diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index b535a36d33..7550040945 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -21,6 +21,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index 8a4881b38e..eddf13ea27 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "framesync.h" #include "internal.h" #include "opencl.h" diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index cfdfac7842..2fa26e6b14 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_pullup.c b/libavfilter/vf_pullup.c index 39a6cb14c2..128ebb71d6 100644 --- a/libavfilter/vf_pullup.c +++ b/libavfilter/vf_pullup.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "vf_pullup.h" diff --git a/libavfilter/vf_qp.c b/libavfilter/vf_qp.c index 37e575447d..86dd7eae29 100644 --- a/libavfilter/vf_qp.c +++ b/libavfilter/vf_qp.c @@ -24,6 +24,7 @@ #include "libavutil/video_enc_params.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_quirc.c b/libavfilter/vf_quirc.c index 760f5d97de..afd172fa34 100644 --- a/libavfilter/vf_quirc.c +++ b/libavfilter/vf_quirc.c @@ -27,6 +27,7 @@ #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "video.h" #include diff --git a/libavfilter/vf_random.c b/libavfilter/vf_random.c index 8c7cf8b806..1b433be08b 100644 --- a/libavfilter/vf_random.c +++ b/libavfilter/vf_random.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "libavutil/random_seed.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #define MAX_FRAMES 512 diff --git a/libavfilter/vf_readeia608.c b/libavfilter/vf_readeia608.c index 7fb143cde0..f663c88a05 100644 --- a/libavfilter/vf_readeia608.c +++ b/libavfilter/vf_readeia608.c @@ -32,6 +32,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_readvitc.c b/libavfilter/vf_readvitc.c index cb63a4d127..1847152249 100644 --- a/libavfilter/vf_readvitc.c +++ b/libavfilter/vf_readvitc.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavutil/timecode.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_removegrain.c b/libavfilter/vf_removegrain.c index 6e6e99198c..a07857893d 100644 --- a/libavfilter/vf_removegrain.c +++ b/libavfilter/vf_removegrain.c @@ -26,6 +26,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/qsort.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "removegrain.h" #include "video.h" diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index 77f0f64ba3..43f1948076 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -73,6 +73,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "bbox.h" diff --git a/libavfilter/vf_sab.c b/libavfilter/vf_sab.c index 9e83e08355..2bd2bfd73a 100644 --- a/libavfilter/vf_sab.c +++ b/libavfilter/vf_sab.c @@ -29,6 +29,7 @@ #include "libswscale/swscale.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 5f20b8a43c..27ec0e6e26 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "scale_eval.h" #include "video.h" diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c index 7210509de3..d53789e6c5 100644 --- a/libavfilter/vf_scale_vulkan.c +++ b/libavfilter/vf_scale_vulkan.c @@ -23,6 +23,7 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "scale_eval.h" +#include "filters.h" #include "internal.h" #include "colorspace.h" #include "video.h" diff --git a/libavfilter/vf_scroll.c b/libavfilter/vf_scroll.c index eebf12e902..229c28876d 100644 --- a/libavfilter/vf_scroll.c +++ b/libavfilter/vf_scroll.c @@ -22,6 +22,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_selectivecolor.c b/libavfilter/vf_selectivecolor.c index eea79b7815..b0e98bfb87 100644 --- a/libavfilter/vf_selectivecolor.c +++ b/libavfilter/vf_selectivecolor.c @@ -32,6 +32,7 @@ #include "libavcodec/mathops.h" // for mid_pred(), which is a macro so no link dependency #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c index b7da8eb54b..ecca2c2360 100644 --- a/libavfilter/vf_setparams.c +++ b/libavfilter/vf_setparams.c @@ -23,6 +23,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_shear.c b/libavfilter/vf_shear.c index 5008db3f46..1598d5b283 100644 --- a/libavfilter/vf_shear.c +++ b/libavfilter/vf_shear.c @@ -26,6 +26,7 @@ #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c index 0405bdb947..5e3aa08672 100644 --- a/libavfilter/vf_showpalette.c +++ b/libavfilter/vf_showpalette.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_shuffleframes.c b/libavfilter/vf_shuffleframes.c index 000be9c090..3d677f64e2 100644 --- a/libavfilter/vf_shuffleframes.c +++ b/libavfilter/vf_shuffleframes.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_shufflepixels.c b/libavfilter/vf_shufflepixels.c index a5de7d67f3..fcc5b14204 100644 --- a/libavfilter/vf_shufflepixels.c +++ b/libavfilter/vf_shufflepixels.c @@ -29,6 +29,7 @@ #include "libavutil/random_seed.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_shuffleplanes.c b/libavfilter/vf_shuffleplanes.c index fb2f85cf55..8b1791f078 100644 --- a/libavfilter/vf_shuffleplanes.c +++ b/libavfilter/vf_shuffleplanes.c @@ -24,6 +24,7 @@ #include "libavutil/pixfmt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_siti.c b/libavfilter/vf_siti.c index 722e7cecc7..ca69211f60 100644 --- a/libavfilter/vf_siti.c +++ b/libavfilter/vf_siti.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index dbbb74339d..5d1a13df52 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -30,6 +30,7 @@ #include "libswscale/swscale.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index d6c7297985..02f53af6ea 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -37,6 +37,8 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" + +#include "filters.h" #include "internal.h" #include "qp_table.h" #include "vf_spp.h" diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index 3bfca7f042..4b08a632ce 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -26,6 +26,7 @@ */ #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index bd955d1b37..8a632c11a5 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -38,6 +38,8 @@ #include "libavutil/avstring.h" #include "libavutil/mem.h" #include "libavutil/opt.h" + +#include "filters.h" #include "drawutils.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vf_super2xsai.c b/libavfilter/vf_super2xsai.c index 65144cbf1b..fb46d18da5 100644 --- a/libavfilter/vf_super2xsai.c +++ b/libavfilter/vf_super2xsai.c @@ -29,6 +29,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/intreadwrite.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 7965dc5dd1..dacd2f6f46 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c index f7001c4ada..dab6ddecab 100644 --- a/libavfilter/vf_thumbnail.c +++ b/libavfilter/vf_thumbnail.c @@ -31,6 +31,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #define HIST_SIZE (3*256) diff --git a/libavfilter/vf_tiltandshift.c b/libavfilter/vf_tiltandshift.c index 08bcb06247..25544d3e70 100644 --- a/libavfilter/vf_tiltandshift.c +++ b/libavfilter/vf_tiltandshift.c @@ -31,6 +31,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_tmidequalizer.c b/libavfilter/vf_tmidequalizer.c index 9e7b14cb67..557df5c1c5 100644 --- a/libavfilter/vf_tmidequalizer.c +++ b/libavfilter/vf_tmidequalizer.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 8029f69663..afc966683d 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -35,6 +35,7 @@ #include "avfilter.h" #include "colorspace.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index 03219857d4..935f8dcdaa 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 7ebcb18f79..ca9b9975aa 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -22,6 +22,7 @@ #include "libavutil/mastering_display_metadata.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index bfd6f45fbd..4f23c5cbae 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -35,6 +35,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 2705ac5270..3548b850a5 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -37,6 +37,7 @@ */ #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" #include "libavutil/common.h" diff --git a/libavfilter/vf_unsharp_opencl.c b/libavfilter/vf_unsharp_opencl.c index 1b7cbde9fd..2a9f61dc18 100644 --- a/libavfilter/vf_unsharp_opencl.c +++ b/libavfilter/vf_unsharp_opencl.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "opencl.h" #include "opencl_source.h" diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index ac3e8ea0da..1d06b57bd8 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -35,6 +35,8 @@ #include "libavutil/pixdesc.h" #include "libavutil/video_enc_params.h" #include "libavcodec/avcodec.h" + +#include "filters.h" #include "internal.h" #include "qp_table.h" #include "avfilter.h" diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 9a6c31228d..28a09a0857 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -40,6 +40,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vaguedenoiser.c b/libavfilter/vf_vaguedenoiser.c index 7c92736df2..1c6f65c2e1 100644 --- a/libavfilter/vf_vaguedenoiser.c +++ b/libavfilter/vf_vaguedenoiser.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index a1f98ece68..2d6da65f26 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/xga_font_data.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index d72605bef0..7dfd94e5fe 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -26,6 +26,7 @@ #include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vfrdet.c b/libavfilter/vf_vfrdet.c index 8d641dd368..a96ebd3b81 100644 --- a/libavfilter/vf_vfrdet.c +++ b/libavfilter/vf_vfrdet.c @@ -20,6 +20,8 @@ #include "libavutil/common.h" #include "libavutil/opt.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c index e1d6e64aeb..d60e50b7d9 100644 --- a/libavfilter/vf_vibrance.c +++ b/libavfilter/vf_vibrance.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index dd86c4d819..e54a99d1b3 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index d1b67c7fb2..3c9813a0ca 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index f45b445443..8be5963186 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -24,6 +24,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/xga_font_data.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 1750da043e..05e621b1c3 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -30,6 +30,8 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" + +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index aa5ca4a889..3b76362c27 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -22,6 +22,7 @@ #include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "yadif.h" diff --git a/libavfilter/vf_yaepblur.c b/libavfilter/vf_yaepblur.c index 9b5ec0348f..c48d99762c 100644 --- a/libavfilter/vf_yaepblur.c +++ b/libavfilter/vf_yaepblur.c @@ -31,6 +31,7 @@ #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 45f1bd25ce..5f473cfa25 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -31,6 +31,7 @@ #include #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/video.c b/libavfilter/video.c index e4b1ba2251..b8a815eb01 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -30,6 +30,7 @@ #include "avfilter.h" #include "avfilter_internal.h" +#include "filters.h" #include "framepool.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/video.h b/libavfilter/video.h index 81331c3199..8c5f6c84e7 100644 --- a/libavfilter/video.h +++ b/libavfilter/video.h @@ -22,7 +22,7 @@ #define AVFILTER_VIDEO_H #include "avfilter.h" -#include "internal.h" +#include "filters.h" /** * An AVFilterPad array whose only entry has name "default" diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c index f21299c6f0..4f61f84500 100644 --- a/libavfilter/vsink_nullsink.c +++ b/libavfilter/vsink_nullsink.c @@ -17,6 +17,7 @@ */ #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "libavutil/internal.h" From patchwork Sat Aug 17 08:13:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp881696vqj; Sat, 17 Aug 2024 01:14:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXn5ODwmpO+CBRn9hFxBnyGeaHywstanBKwX7Gho2U/yUTt8IHhtZjmFONwZJ3DMUWxI0+7jIcXz9EUxoVc9Jl+dCmFt+q2Ge2BlA== X-Google-Smtp-Source: AGHT+IHD8IEJwwi7Rp7jftvFblkCs8IJGgMQI+OE/8GxQIFdd31GOEWLkeBOEiX+vw74WP8QbyVD X-Received: by 2002:a05:6512:1092:b0:52d:b150:b9b3 with SMTP id 2adb3069b0e04-5331c6b34a3mr3320798e87.32.1723882459004; Sat, 17 Aug 2024 01:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882458; cv=none; d=google.com; s=arc-20160816; b=ASsiAnPRXIUwHGkz7xDws5FmlfWK6OnPt51nmuJ1QLbW0kiYYgwhr3gl/9U3ZDPDY4 FrNWaIP0bhhLpLEK5QhFyVfzH5/d6eIbSezQ9POVk5X/645KCq+wCVaSegKxRtECmrsI +FY7ct/oDhaDXWghWFEw7oAW406Qt6JurVdIjg6a9dR3E/40FiE3j79w2oNQiUpkiMhZ LKaN8zAwYZithAnJ+zp2WE7pTeFtWH6V42muQ2d1pbmstzTPu1RTORjZ/d6k4M7c/Sq1 mMcffcFKMXZfQUArD+P41uNdrXBV/BwWSuD7l5MI4PQtf8nkQDveLDeJLHhdQwjeXuUu 9Y0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=YsizaZQ4FzZTTca3pDnFlGO3Delxs1nckEf4fIlpKNY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VQhI6ypbgWZCI7+OwCDNAwdIrFSLFkjco55s/d7jZ17Wl01UI/9iTHaqByDLqfey8s Lg3Bk+H5cxYCKXSsvPTT5+s2XFD2EdQwP5pIRgXkmE2iIwJOyMBZvrYrMVMc/O4ig5qT jZSSsHD3JvvF5X5WFm+k5JgAOSRLbrMElr40pQi7zO4QtWKHxpavm2XGj8E8DugRT5o6 MmVeTw4wmrpsAf+ajI/6P+/oTWQnu9fSYrM149DwvZxtn0m9xY77G+IDOgG40+i8qZQo Aesy2Yo8j5IPimreKhj40M7StpWJcm6biwAUUUJT2DNKiw/0GvgQOOLMQTy24hfMbMRB bXXA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=qTK9uXUl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a83839489d9si308826266b.511.2024.08.17.01.14.18; Sat, 17 Aug 2024 01:14:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=qTK9uXUl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A157B68DCE4; Sat, 17 Aug 2024 11:14:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF48568DC9A for ; Sat, 17 Aug 2024 11:14:08 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=qTK9uXUl; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id ED8C84E05 for ; Sat, 17 Aug 2024 10:14:07 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id PhuRWKAE2Akh for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=+6IJzKJ3WVKshXRLXl51RkJmL8mvh0h7M1+5SHtxXVM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qTK9uXUlMbYCa630g7z2gV2/hlmQ8hxdREvcM6XmlUPCH767vZr+cCQT8GcEYX29m /Esb8iAAUPSa2L2qqjB/eDpkiqu5VUqRD83R0bAOIKqUVc9BeDpoeXWGhSBVgFsA62 IbUCDiuSKYTsV/OjI/ZPjwQAtRTEFUT23tCA5A+saHVSJmfRyKVKT8XJRSZa+TtcA3 xd77Q+ggjpDxq7ln9cRYLRF2noqE/Vdcyd56t2r0DYlqK9cfEyIb/yFxp51VZIHG/B HddeIDhNxw6nkFZuw8QiA6GX3QVYs6+MA806SHHx7DUurImH0yKIt+v0XbPUwzk0Ch nXHfublBbuA4Q== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9A06A4DE1 for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 350813A1676 for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:52 +0200 Message-ID: <20240817081358.2354-2-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] lavfi: move ff_parse_pixel_format() to vf_format, its only caller X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WNhStrZAlGgx The only thing this function does beyond calling av_get_pix_fmt() is falling back onto parsing the argument as a number. No other filters should need to do this. --- libavfilter/formats.c | 15 --------------- libavfilter/internal.h | 11 ----------- libavfilter/vf_format.c | 17 ++++++++++++++++- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 15099ac545..18f7b89104 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -939,21 +939,6 @@ int ff_default_query_formats(AVFilterContext *ctx) /* internal functions for parsing audio format arguments */ -int ff_parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ctx) -{ - char *tail; - int pix_fmt = av_get_pix_fmt(arg); - if (pix_fmt == AV_PIX_FMT_NONE) { - pix_fmt = strtol(arg, &tail, 0); - if (*tail || !av_pix_fmt_desc_get(pix_fmt)) { - av_log(log_ctx, AV_LOG_ERROR, "Invalid pixel format '%s'\n", arg); - return AVERROR(EINVAL); - } - } - *ret = pix_fmt; - return 0; -} - int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx) { char *tail; diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 4938612593..343bc0b330 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -35,17 +35,6 @@ int ff_fmt_is_regular_yuv(enum AVPixelFormat fmt); /* Functions to parse audio format arguments */ -/** - * Parse a pixel format. - * - * @param ret pixel format pointer to where the value should be written - * @param arg string to parse - * @param log_ctx log context - * @return >= 0 in case of success, a negative AVERROR code on error - */ -av_warn_unused_result -int ff_parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ctx); - /** * Parse a sample rate. * diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 2b88b10f65..83deff7190 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -86,6 +86,21 @@ static av_cold int invert_formats(AVFilterFormats **fmts, return 0; } +static int parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ctx) +{ + char *tail; + int pix_fmt = av_get_pix_fmt(arg); + if (pix_fmt == AV_PIX_FMT_NONE) { + pix_fmt = strtol(arg, &tail, 0); + if (*tail || !av_pix_fmt_desc_get(pix_fmt)) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid pixel format '%s'\n", arg); + return AVERROR(EINVAL); + } + } + *ret = pix_fmt; + return 0; +} + static av_cold int init(AVFilterContext *ctx) { FormatContext *s = ctx->priv; @@ -96,7 +111,7 @@ static av_cold int init(AVFilterContext *ctx) sep = strchr(cur, '|'); if (sep && *sep) *sep++ = 0; - if ((ret = ff_parse_pixel_format(&pix_fmt, cur, ctx)) < 0 || + if ((ret = parse_pixel_format(&pix_fmt, cur, ctx)) < 0 || (ret = ff_add_format(&s->formats, pix_fmt)) < 0) return ret; } From patchwork Sat Aug 17 08:13:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51059 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp886835vqj; Sat, 17 Aug 2024 01:31:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlrtuVYK6W6iT7zJVpSoLgYUP9veUVzAmnjlr+9bLGMpDgszdAl3UkL0bN0OfjlmsraR7LpYVmXTugHbgqhw0xmmb90yfNfDW3zw== X-Google-Smtp-Source: AGHT+IGOZdfg7O/HAwSJGE+pJ3rWccdY0nj6QZSw94bHyRpUApLb57lKf8Evi3BGJcKK/bQsx/IL X-Received: by 2002:a05:6402:3595:b0:5a3:18a6:6988 with SMTP id 4fb4d7f45d1cf-5beca593dc7mr4790651a12.17.1723883478118; Sat, 17 Aug 2024 01:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723883478; cv=none; d=google.com; s=arc-20160816; b=d59na5NgLUNC+Kkd38Wu7/AiQG7VUk3Lc8zY/BcMtwmpOv7gU191vi88XTV9tDbqj5 83deVjoXy3MYPLrEtIepWTYWmzr+NKhlnzc8LYsZY9MT9tDTrz5uUH4befaeq+kGK93b iaoH6mhQtAZYYHj30u9foo4tHcJ0brU43WdIgdFvWjJeXZtbWjV+NrrWzJXUBYVVq/2q i5kEQWQDyihCkSRkA8w4JurX1gd2nHdm2wr0OkC80DC6a9QsClq5MzQfKKwx6KGng1Bp YZIkuSoJ2V70V7BRfXwAx1SLzOabnnYdT2MUPCetzBRdRXrybFKFBC9fEi31FYch/1rW XCUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=SPX22/HDzbexqUunDPaWA3rDXC77SzJyicf+ApK9ruk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CjUfO4jtkUPf4gCv7NcSBG/hmYKEdcyk+mpn8QriABf8oKc9a6p5Z4OLJGlTnamKyr 3EDIYWCD0LBsj5DS17pWgQTknRfCKwa9UQ+JvXksum9dYKAIgoO+1deroCsSw3kS2tvE NyYtkgQKbQLOtDGUbw7tEssN9B5KbCzdFdhIz1aRlTizwP62LWyrFOZI9morvV/gWM++ GvQKQR0mLANV+zbdmJ02kYz3Mdpz84gSbdmKWFLmv3MA63r6/vPSmlDc1n6fDcAlxQOZ S4/yxh2ttofo6peBsOa38G4KIMCivxI+SU7gaEV3/Z7n/IlJE5gM54s/VpE7B2WXCkw1 G4tQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="O0rWno/r"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5bebc7fde15si2838193a12.373.2024.08.17.01.31.17; Sat, 17 Aug 2024 01:31:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="O0rWno/r"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 042DF68DCF9; Sat, 17 Aug 2024 11:14:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2649068DCC6 for ; Sat, 17 Aug 2024 11:14:09 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=O0rWno/r; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id C06224DD7 for ; Sat, 17 Aug 2024 10:14:08 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Xgiuo8tuRQAf for ; Sat, 17 Aug 2024 10:14:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=LKGnqHK+Zqyhz9gF0pUvOMWwhm98FMJoikGMqKUlf+4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=O0rWno/rILrKOJHrtTUdMC7gNAB6StucNcgbwVjDp56rGJv7LiuXYn60RwTW4lBcW mDkVGbrzGG4up/BnKNNJ9y34BuM9LV6lvj+o/aa7r/ohrIDg6arzwsq4HPsxJFahGE 8KTuKqsAfCkAnBuR7SwkOzF9h5w4T3K36oAmhW33sAQWgR2aiULA7xB3lEtAvvHJ8w ehj1XE06bv/Jy9cCITSzJ2BuIdk5sDPy3oS3r+U4ecmXYhTPvMJK0BFqrctx5CEO/7 BZEoLYSib9IPeP1LxazwcJuGDnYqzticwDCUiaVuWGEaDScE7f9/fGb2pSSuYgb/8G idMA9T0XX2ViA== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 97C3A4DDE for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 401613A170F for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:53 +0200 Message-ID: <20240817081358.2354-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] lavfi: move ff_parse_{sample_rate, channel_layout}() to audio.[ch] X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YTQjL/gY/2E1 That is a more appropriate place for those functions. --- libavfilter/audio.c | 36 +++++++++++++++++++++++++++++++++++ libavfilter/audio.h | 25 ++++++++++++++++++++++++ libavfilter/formats.c | 38 ------------------------------------- libavfilter/internal.h | 27 -------------------------- libavfilter/tests/formats.c | 1 + 5 files changed, 62 insertions(+), 65 deletions(-) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 1768b31184..11b3d0c9c3 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -23,6 +23,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/cpu.h" +#include "libavutil/eval.h" #include "audio.h" #include "avfilter.h" @@ -107,3 +108,38 @@ AVFrame *ff_get_audio_buffer(AVFilterLink *link, int nb_samples) return ret; } + +int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx) +{ + char *tail; + double srate = av_strtod(arg, &tail); + if (*tail || srate < 1 || (int)srate != srate || srate > INT_MAX) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid sample rate '%s'\n", arg); + return AVERROR(EINVAL); + } + *ret = srate; + return 0; +} + +int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, + void *log_ctx) +{ + AVChannelLayout chlayout = { 0 }; + int res; + + res = av_channel_layout_from_string(&chlayout, arg); + if (res < 0) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg); + return AVERROR(EINVAL); + } + + if (chlayout.order == AV_CHANNEL_ORDER_UNSPEC && !nret) { + av_log(log_ctx, AV_LOG_ERROR, "Unknown channel layout '%s' is not supported.\n", arg); + return AVERROR(EINVAL); + } + *ret = chlayout; + if (nret) + *nret = chlayout.nb_channels; + + return 0; +} diff --git a/libavfilter/audio.h b/libavfilter/audio.h index aab80baa50..881df0cf87 100644 --- a/libavfilter/audio.h +++ b/libavfilter/audio.h @@ -47,4 +47,29 @@ AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples); */ AVFrame *ff_get_audio_buffer(AVFilterLink *link, int nb_samples); +/** + * Parse a sample rate. + * + * @param ret unsigned integer pointer to where the value should be written + * @param arg string to parse + * @param log_ctx log context + * @return >= 0 in case of success, a negative AVERROR code on error + */ +av_warn_unused_result +int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx); + +/** + * Parse a channel layout or a corresponding integer representation. + * + * @param ret 64bit integer pointer to where the value should be written. + * @param nret integer pointer to the number of channels; + * if not NULL, then unknown channel layouts are accepted + * @param arg string to parse + * @param log_ctx log context + * @return >= 0 in case of success, a negative AVERROR code on error + */ +av_warn_unused_result +int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, + void *log_ctx); + #endif /* AVFILTER_AUDIO_H */ diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 18f7b89104..cd7c68f592 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -22,7 +22,6 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" -#include "libavutil/eval.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "avfilter.h" @@ -937,43 +936,6 @@ int ff_default_query_formats(AVFilterContext *ctx) return 0; } -/* internal functions for parsing audio format arguments */ - -int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx) -{ - char *tail; - double srate = av_strtod(arg, &tail); - if (*tail || srate < 1 || (int)srate != srate || srate > INT_MAX) { - av_log(log_ctx, AV_LOG_ERROR, "Invalid sample rate '%s'\n", arg); - return AVERROR(EINVAL); - } - *ret = srate; - return 0; -} - -int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, - void *log_ctx) -{ - AVChannelLayout chlayout = { 0 }; - int res; - - res = av_channel_layout_from_string(&chlayout, arg); - if (res < 0) { - av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg); - return AVERROR(EINVAL); - } - - if (chlayout.order == AV_CHANNEL_ORDER_UNSPEC && !nret) { - av_log(log_ctx, AV_LOG_ERROR, "Unknown channel layout '%s' is not supported.\n", arg); - return AVERROR(EINVAL); - } - *ret = chlayout; - if (nret) - *nret = chlayout.nb_channels; - - return 0; -} - static int check_list(void *log, const char *name, const AVFilterFormats *fmts) { unsigned i, j; diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 343bc0b330..eb312ab485 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -33,33 +33,6 @@ */ int ff_fmt_is_regular_yuv(enum AVPixelFormat fmt); -/* Functions to parse audio format arguments */ - -/** - * Parse a sample rate. - * - * @param ret unsigned integer pointer to where the value should be written - * @param arg string to parse - * @param log_ctx log context - * @return >= 0 in case of success, a negative AVERROR code on error - */ -av_warn_unused_result -int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx); - -/** - * Parse a channel layout or a corresponding integer representation. - * - * @param ret 64bit integer pointer to where the value should be written. - * @param nret integer pointer to the number of channels; - * if not NULL, then unknown channel layouts are accepted - * @param arg string to parse - * @param log_ctx log context - * @return >= 0 in case of success, a negative AVERROR code on error - */ -av_warn_unused_result -int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, - void *log_ctx); - /** * Negotiate the media format, dimensions, etc of all inputs to a filter. * diff --git a/libavfilter/tests/formats.c b/libavfilter/tests/formats.c index ed1de24a4c..5cc3ca3371 100644 --- a/libavfilter/tests/formats.c +++ b/libavfilter/tests/formats.c @@ -19,6 +19,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavfilter/audio.h" #include "libavfilter/formats.c" #undef printf From patchwork Sat Aug 17 08:13:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp881742vqj; Sat, 17 Aug 2024 01:14:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdJ148y/amsjCUASIDkt8fpQUn+/gGeisu+PX+/O3j90kbzIoQM51V5eHxzEHDV54Qv5NNYCvoGsfT+8rdbnwoCavANrTrKdvoyg== X-Google-Smtp-Source: AGHT+IHavweWLuOMYOYRgjymmQeW4Fn3HHG3fJIqogZVrwWqXsyrBAdBJcKXKUsM4scKWJFaK4Jq X-Received: by 2002:a2e:a547:0:b0:2f1:6108:3f00 with SMTP id 38308e7fff4ca-2f3bee7784fmr17836371fa.0.1723882469634; Sat, 17 Aug 2024 01:14:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882469; cv=none; d=google.com; s=arc-20160816; b=oj/w9/ocl7FqtiTD5MxfhmirtGOrogS55t0zirfOpowUNnVBy3k9lwSc5hnzzWj5AU 4Oki8EBy6LBLY6v1TT6wIHAveMqug8IcknFkGZq0k0Xt5D4N/tCw26Q3L1yDIH2+DyDn jdYe9yJGBqxjQ2Fu63Q5VnC3/D3SH9+O3eh/Xn2O+ZDdB00Mkn6LiFHz0wdZfVbizNRr XBK8Gat30dO+TUVNkVe4gOLhdu2sDZwV4NVOOLJPEgFxgteo2xusRUzRymoCHgBiRjUW wJu1u9bAOZptev3UpO2XimhQB5rRVFw3RtRCsU30Giu6k2TTf/91ebdCUysBombXS2FP 866Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=e+XoxxXW9OTBnCL/dOxc7PMbrmte79PBjxGP2y66bOQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=V0Io7RE1cOuW95vxrnMnO9BaDHzH7Toi8w3SB6YgQV1m7SlcsyHaCphW4yRcQ9IIpK 66aJwfA+gUsajUBRoDntTFs+pItH0DY+XZLRtuSsZrqNGOsUbYHwqvvi+VTsAxwBFFP/ tmfuvVGYuwOztBDpGfHhrTwLQ6Pf6v5mHdUc0eI/0l4BCW6HxyHBOK0GadSM/Z8MBP0D L7Ul6g4U1XivLr02hkPTN273C+fE36qmtX0A+EiWVx98yCr7UeLbWdW5qiKRnsvRBryI Whs8OxVSm+GGwvaXFX5VOFICX0KcoEN25hcc8jwcWNC0B0xo179aaENZyjiko0kFiwD9 acyw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=iec0tNhs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f3b771ae0dsi12783041fa.497.2024.08.17.01.14.28; Sat, 17 Aug 2024 01:14:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=iec0tNhs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD4A268DCB5; Sat, 17 Aug 2024 11:14:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1A7E68DCC6 for ; Sat, 17 Aug 2024 11:14:08 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=iec0tNhs; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 69CD24DE1 for ; Sat, 17 Aug 2024 10:14:08 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id jYz4eZhcMyPJ for ; Sat, 17 Aug 2024 10:14:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=0KOKn5W4V2K4+us/YMtiLJbgLgzu0XX4CXivd9kzlpQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iec0tNhsfNRk1KeBeGqGfbxfjBNlpKiRrCddSnfoVGFKFz6RfVaeIeSz9KwjbpMGK K8PAt4XWHeZkO1SO177Thob73T8xX2v7vMGwjWry9IzwxxU5lhyVvMpeLojo5mjdRw TEpDecuHpkArbBn37lLsEqtncLFIAJQCRF1mFUciLuaUyHfsMxworPBQbsOJ3ZGvO6 D35oYTO4c91VLyz8+r7xSJKGc43uU7gAe5SGekOwMlQ7NLjo+KsIxEgZnJ97xx62it xh7p6swEMmXclPrLR+tQoDegTgBVqO0vHZWsUi8sLF0zWQXrDPOjcnuC3b/4tDgomC KdyfgZDRZwfVg== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 94FC24DD7 for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 4C6A43A17C2 for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:54 +0200 Message-ID: <20240817081358.2354-4-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/8] lavfi/inernal: move ff_fmt_is_regular_yuv() declaration to video.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X9qCp1uieMpo --- libavfilter/avfiltergraph.c | 1 + libavfilter/buffersrc.c | 1 + libavfilter/internal.h | 6 ------ libavfilter/video.h | 6 ++++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 0da2f8462b..6317f8d457 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -40,6 +40,7 @@ #include "formats.h" #include "framequeue.h" #include "internal.h" +#include "video.h" #define OFFSET(x) offsetof(AVFilterGraph, x) #define F AV_OPT_FLAG_FILTERING_PARAM diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 2743493d5d..1cf23fe37b 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -39,6 +39,7 @@ #include "filters.h" #include "formats.h" #include "internal.h" +#include "video.h" typedef struct BufferSourceContext { const AVClass *class; diff --git a/libavfilter/internal.h b/libavfilter/internal.h index eb312ab485..6a0b9ed7e1 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -27,12 +27,6 @@ #include "libavutil/internal.h" #include "avfilter.h" -/** - * Returns true if a pixel format is "regular YUV", which includes all pixel - * formats that are affected by YUV colorspace negotiation. - */ -int ff_fmt_is_regular_yuv(enum AVPixelFormat fmt); - /** * Negotiate the media format, dimensions, etc of all inputs to a filter. * diff --git a/libavfilter/video.h b/libavfilter/video.h index 8c5f6c84e7..77f27fdf7c 100644 --- a/libavfilter/video.h +++ b/libavfilter/video.h @@ -45,4 +45,10 @@ AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h); */ AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h); +/** + * Returns true if a pixel format is "regular YUV", which includes all pixel + * formats that are affected by YUV colorspace negotiation. + */ +int ff_fmt_is_regular_yuv(enum AVPixelFormat fmt); + #endif /* AVFILTER_VIDEO_H */ From patchwork Sat Aug 17 08:13:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp881778vqj; Sat, 17 Aug 2024 01:14:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1YDOOHqCDAewsT5f+CvWNL3K19hqKw+i+g3Hthh2HHuzHtNNdQsCBqJHjt+xxSj8L96IBJzkAsu8f7yIUVheE@gmail.com X-Google-Smtp-Source: AGHT+IFEVpWaxJM6dZN8lDt31XIKOU5AW8Ie935fRv/3OnUhRNT8C3MLuCtvLsxyi7o6BoZ8Te5D X-Received: by 2002:a05:6402:1ed5:b0:5a1:efd1:ca1e with SMTP id 4fb4d7f45d1cf-5beca52de46mr2218920a12.2.1723882476920; Sat, 17 Aug 2024 01:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882476; cv=none; d=google.com; s=arc-20160816; b=pVOKMAD79ga8EcGMfIrL4BU++EWfeIhwlCiRcOr6jnI1fGTzHRGVUXYCEffCK0hRTP ymoDQg2jquodm6M8sa8TSfwVA+PHniNUwd1IrHYNDcA/GAf//7dlPDnZ1SUxJDpm2ybk 9W5gIPRLiau/SUJzmPIoZlYx49+HQ7R1NDQ5+xkhFQILqyD1D21NlHug0bwlzRU589vg PIvbj7822tAtTvRkd0uqUvaAdknCSNMJvRJf68GVS8opvnANJQsEnAxp1uN60VQVDDHq p40Zg946XO0aAwhfYY70Yf6hvlfJYAgNuvD8GnDgFg4q6djPsBw9ggNqRvTl+yHiQBn8 7ziw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=GXnvGvvWNCusqRSqKFONgxzuDrqph/VQb+ebxIDfoZA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=yZ4EjZM+wDS9lnRbT/M39a7iosDEd6hPRNrbR8QmthJQknnX3lw1KgsdlMZviLNgY1 TEFEAu3UDPNnginQBWcFy1ogUD1hrwsL7bKYhCjjenGczz/PLVihY4ROQ1JgbHYPUvuM OJ/zbrbf+NnMOSxVrOeGUCp9M4QZnQk/kz91rEkvMEdBBieMslmxJf/EjpEkrETLP9L3 CFaHnfQfXJIgW7uUKSxSUL/IqSScHeqQN/1LH/GohjwQiDRZgyatbNQF2sKntGB00OIL 6FbiYiyJ3GyvYzBAfMJN3dOCP+PEAm/DcwJJqTJS3zzhL5RcqQYR7lWN64p4H9gle1aJ 626w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=YZxVcROJ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5becc3d8fd8si1981474a12.439.2024.08.17.01.14.36; Sat, 17 Aug 2024 01:14:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=YZxVcROJ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B038668DCF2; Sat, 17 Aug 2024 11:14:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2D0668DCC0 for ; Sat, 17 Aug 2024 11:14:08 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=YZxVcROJ; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id E99784E02 for ; Sat, 17 Aug 2024 10:14:07 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id CJLUJzS-blqG for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=AiNuD5iY8f1+WzWIna0DsYzVYCSUS0qLHgwVcNIQ9lo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YZxVcROJ56jEmXx9zO7A39iyMqAqXd6dshzQKa9hCxrHDP3lFZdfWBxRU/k3n7IIX C1af/XR/h667J9w7RIwNvzweHPXbAjYoKRHhRm9bpYf4W6pRdny6hH3Vascmn0YyeR AxP/9HXXBrAhOpacHenSs874CXA5XQFBPejhZZPMKmQzbhUpn0pDNVWR5coYPj9MBb Sgt6343x0XgIUhoYiL4ho+YYJIS2DjxS/o4uSvN36QfQin47a0dTXcCLG4M1efrB4n 0G9H3uN+/gKrSqcJS5QRVPx21yYyQixoB+2hFzS00/Vlkra91S0cpWBkicBNjZD2eQ mCB4TPYBVmSlQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9D6844DEC for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 572D03A181F for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:55 +0200 Message-ID: <20240817081358.2354-5-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] lavfi/f_streamselect: remove a no-op ff_filter_config_links() call X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Q0+jr2zI375j It does not do anything when the links are already configured. --- libavfilter/f_streamselect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 07d55a7506..ecdcc7f269 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -249,7 +249,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar if (ret < 0) return ret; - return ff_filter_config_links(ctx); + return 0; } return AVERROR(ENOSYS); } From patchwork Sat Aug 17 08:13:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp883859vqj; Sat, 17 Aug 2024 01:21:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8KKr82fWKU4MEuGhOYXjnwyKIw7Zw3tGsTrb1I4ryC/jsZhO4mPnM2poGEa4lXs4LUD6JDEltAGdn0oV1CElBia6Xa1Ox8AmIfA== X-Google-Smtp-Source: AGHT+IEOGyHHfBisOIGPAwPfVeAD46j7fm/2YoXbhON2ToeDkjvTsgc0sbJegUTds5kNjMyzhSa9 X-Received: by 2002:a17:907:6e90:b0:a80:c130:f72 with SMTP id a640c23a62f3a-a8392930aecmr361890266b.16.1723882878801; Sat, 17 Aug 2024 01:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882878; cv=none; d=google.com; s=arc-20160816; b=o3Qs3d0SREHcdkQ9Vw0zU9ByrGhe+cu7spnhbk8HsJ2Vdcc/OekAn+sPSSor4OfgJn cupMy+nLQOxz2cZVlyOTA4GR46BrsbUPLUkIBIzlcq6DWMSDHzGMINOr4aA2bo8aanp9 pCpTare4oPwTSHxrl2AQViM6tBhqVJUmMkP9sGpdBeKRUUFWW7ICWE6vnRSl+TSU098V foUClnn13O0iefzSgklBy2s/fDfL10EGKrnG4tEpagPCcp9mzhEVaHPj0xT37d4W3VnT KbiJsjj0H3ST7WtDv7Fv1nwZr4ZNmgAmiebJ1MPBf5k7vJIEH+6ANVl2teoEejWkmcpC 6K4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Y/fkgGVdiJk0XIhQZnzfsD8ZMvGtEEzbbT/jlZMoyKk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UHwOpAi0nZuYcL+VTtFRnZZS5rsVLEf1a97ML0zZ2aflGqRSrZ0HQBPFHhh2XdyMqC DXGLBtnG9wC1brMp+xZoMwJcqnXPQ+N/RwxS2j6iQJBMdMCTcPbF6YWBRdOMJcJ8qrvp A4J4OC62edmkdapQOQwiInCUPDcp9hBj/XpYHoEiUTSXxAaB7D8AsrRdCfkUjXGQ2Umv Qdd2ATHw4fEQv3uuO9q2sbi5yVItIhvrYY2JJC0TplREKCGBNANESQerr8jL/6F4ZE2k 9QQzeE9JJqOBv1bXV9HvfO+KkQlw4CyZ3Fns1qaDpy6dDB8KNsJ8+O9sCgqljXHVXg2I ssQQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="d/YGDp+h"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a838396f388si289479666b.732.2024.08.17.01.21.18; Sat, 17 Aug 2024 01:21:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="d/YGDp+h"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A01E068DD16; Sat, 17 Aug 2024 11:14:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1780268DCFC for ; Sat, 17 Aug 2024 11:14:14 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=d/YGDp+h; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 892A14DDE for ; Sat, 17 Aug 2024 10:14:10 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 0XCRnBY_gVq2 for ; Sat, 17 Aug 2024 10:14:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=n90cEOJ+M1tgVX1FgX76osiZvDUENVsGe1KADlNgTu4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=d/YGDp+hMkMkQf/NTUqfJr9aTakGp79EO4jFEWLfbjWhNgalfC9kyTesXJlnZhoAH /IIRl8nPy8GycMeR7uzTvHNbVEbSp46VMe5aslq1O/4sPycHrXo6yVY1ZPKDLhJ2Df u1OKZPVIrThuFg5b5RWqCUgOVk7Hl7BQzRnKYDbsMU6iPmEXT5x98c4RFtiD1XGJfz MZONHpn+Q1YIyrF1A8qww1Aq2OuZgHYG1+qf+rkp8wLi1nUdcgH6CqocjUoboxaVSI yRHNFqNNVre9sAUHcEvgb8MP7Z3svjVnCvWiy4ths1Az81PwtIY6RZd9IOJJNFeKPk 3qBgrhg3WnlSA== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id B77994DEE for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 649A23A27C7 for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:56 +0200 Message-ID: <20240817081358.2354-6-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] lavfi: drop internal.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 04bcMPtUOF9H All that remains in it are things that belong in avfilter_internal.h. Move them ther and remove internal.h --- libavfilter/aeval.c | 1 - libavfilter/af_aap.c | 1 - libavfilter/af_acopy.c | 1 - libavfilter/af_acrossover.c | 1 - libavfilter/af_acrusher.c | 1 - libavfilter/af_adeclick.c | 1 - libavfilter/af_adelay.c | 1 - libavfilter/af_adenorm.c | 1 - libavfilter/af_aderivative.c | 1 - libavfilter/af_adrc.c | 1 - libavfilter/af_aecho.c | 1 - libavfilter/af_aemphasis.c | 1 - libavfilter/af_aexciter.c | 1 - libavfilter/af_afade.c | 1 - libavfilter/af_afftfilt.c | 1 - libavfilter/af_afir.c | 1 - libavfilter/af_aformat.c | 1 - libavfilter/af_aiir.c | 1 - libavfilter/af_alimiter.c | 1 - libavfilter/af_amerge.c | 1 - libavfilter/af_amix.c | 1 - libavfilter/af_amultiply.c | 1 - libavfilter/af_anequalizer.c | 1 - libavfilter/af_anlmdndsp.h | 1 - libavfilter/af_anlms.c | 1 - libavfilter/af_anull.c | 1 - libavfilter/af_apad.c | 1 - libavfilter/af_aphaser.c | 1 - libavfilter/af_apsyclip.c | 1 - libavfilter/af_apulsator.c | 1 - libavfilter/af_aresample.c | 1 - libavfilter/af_arls.c | 1 - libavfilter/af_asdr.c | 1 - libavfilter/af_asetnsamples.c | 1 - libavfilter/af_asetrate.c | 1 - libavfilter/af_ashowinfo.c | 1 - libavfilter/af_aspectralstats.c | 1 - libavfilter/af_asr.c | 1 - libavfilter/af_astats.c | 1 - libavfilter/af_atempo.c | 1 - libavfilter/af_axcorrelate.c | 1 - libavfilter/af_biquads.c | 1 - libavfilter/af_bs2b.c | 1 - libavfilter/af_channelmap.c | 1 - libavfilter/af_channelsplit.c | 1 - libavfilter/af_chorus.c | 1 - libavfilter/af_compand.c | 1 - libavfilter/af_compensationdelay.c | 1 - libavfilter/af_dcshift.c | 1 - libavfilter/af_dialoguenhance.c | 1 - libavfilter/af_drmeter.c | 1 - libavfilter/af_dynaudnorm.c | 1 - libavfilter/af_firequalizer.c | 1 - libavfilter/af_flanger.c | 1 - libavfilter/af_hdcd.c | 1 - libavfilter/af_headphone.c | 1 - libavfilter/af_join.c | 1 - libavfilter/af_ladspa.c | 1 - libavfilter/af_loudnorm.c | 1 - libavfilter/af_lv2.c | 1 - libavfilter/af_mcompand.c | 1 - libavfilter/af_pan.c | 1 - libavfilter/af_replaygain.c | 1 - libavfilter/af_rubberband.c | 1 - libavfilter/af_sidechaincompress.c | 1 - libavfilter/af_silencedetect.c | 1 - libavfilter/af_silenceremove.c | 1 - libavfilter/af_sofalizer.c | 1 - libavfilter/af_speechnorm.c | 1 - libavfilter/af_superequalizer.c | 1 - libavfilter/af_surround.c | 1 - libavfilter/af_tremolo.c | 1 - libavfilter/af_vibrato.c | 1 - libavfilter/af_virtualbass.c | 1 - libavfilter/af_volume.c | 1 - libavfilter/af_volumedetect.c | 1 - libavfilter/afir_template.c | 1 - libavfilter/asink_anullsink.c | 1 - libavfilter/asrc_afdelaysrc.c | 1 - libavfilter/asrc_afirsrc.c | 1 - libavfilter/asrc_anoisesrc.c | 1 - libavfilter/asrc_anullsrc.c | 1 - libavfilter/asrc_flite.c | 1 - libavfilter/asrc_hilbert.c | 1 - libavfilter/asrc_sinc.c | 1 - libavfilter/asrc_sine.c | 1 - libavfilter/audio.c | 1 - libavfilter/avf_a3dscope.c | 1 - libavfilter/avf_abitscope.c | 1 - libavfilter/avf_ahistogram.c | 1 - libavfilter/avf_aphasemeter.c | 1 - libavfilter/avf_avectorscope.c | 1 - libavfilter/avf_concat.c | 1 - libavfilter/avf_showcqt.c | 1 - libavfilter/avf_showcqt.h | 1 - libavfilter/avf_showcwt.c | 1 - libavfilter/avf_showfreqs.c | 1 - libavfilter/avf_showspatial.c | 1 - libavfilter/avf_showspectrum.c | 1 - libavfilter/avf_showvolume.c | 1 - libavfilter/avf_showwaves.c | 1 - libavfilter/avfilter.c | 1 - libavfilter/avfilter_internal.h | 23 +++++++++++ libavfilter/avfiltergraph.c | 1 - libavfilter/blend_modes.c | 1 - libavfilter/buffersink.c | 1 - libavfilter/buffersrc.c | 2 +- libavfilter/dialoguenhance_template.c | 1 - libavfilter/dnn/dnn_backend_openvino.c | 1 - libavfilter/dnn/dnn_backend_tf.c | 1 - libavfilter/dnn/dnn_backend_torch.cpp | 1 - libavfilter/dnn/dnn_interface.c | 1 - libavfilter/edge_template.c | 1 - libavfilter/f_bench.c | 1 - libavfilter/f_cue.c | 1 - libavfilter/f_drawgraph.c | 1 - libavfilter/f_ebur128.c | 1 - libavfilter/f_graphmonitor.c | 1 - libavfilter/f_interleave.c | 1 - libavfilter/f_latency.c | 1 - libavfilter/f_loop.c | 1 - libavfilter/f_metadata.c | 1 - libavfilter/f_realtime.c | 1 - libavfilter/f_reverse.c | 1 - libavfilter/f_segment.c | 1 - libavfilter/f_select.c | 1 - libavfilter/f_sendcmd.c | 1 - libavfilter/f_sidedata.c | 1 - libavfilter/f_streamselect.c | 1 - libavfilter/f_zmq.c | 1 - libavfilter/filters.h | 1 - libavfilter/formats.c | 1 - libavfilter/graphdump.c | 1 - libavfilter/graphparser.c | 1 - libavfilter/internal.h | 53 -------------------------- libavfilter/median_template.c | 1 - libavfilter/phase_template.c | 1 - libavfilter/qrencode.c | 1 - libavfilter/qsvvpp.c | 1 - libavfilter/setpts.c | 1 - libavfilter/settb.c | 1 - libavfilter/signature.h | 1 - libavfilter/split.c | 1 - libavfilter/src_avsynctest.c | 1 - libavfilter/src_movie.c | 1 - libavfilter/tests/filtfmts.c | 1 - libavfilter/trim.c | 1 - libavfilter/vaapi_vpp.c | 1 - libavfilter/vaf_spectrumsynth.c | 1 - libavfilter/vf_addroi.c | 1 - libavfilter/vf_alphamerge.c | 1 - libavfilter/vf_amplify.c | 1 - libavfilter/vf_aspect.c | 1 - libavfilter/vf_atadenoise.c | 1 - libavfilter/vf_avgblur.c | 1 - libavfilter/vf_avgblur_opencl.c | 1 - libavfilter/vf_avgblur_vulkan.c | 1 - libavfilter/vf_backgroundkey.c | 1 - libavfilter/vf_bbox.c | 1 - libavfilter/vf_bilateral.c | 1 - libavfilter/vf_bilateral_cuda.c | 1 - libavfilter/vf_bitplanenoise.c | 1 - libavfilter/vf_blackdetect.c | 1 - libavfilter/vf_blackframe.c | 1 - libavfilter/vf_blend.c | 1 - libavfilter/vf_blend_vulkan.c | 1 - libavfilter/vf_blockdetect.c | 1 - libavfilter/vf_blurdetect.c | 1 - libavfilter/vf_bm3d.c | 1 - libavfilter/vf_boxblur.c | 1 - libavfilter/vf_bwdif.c | 1 - libavfilter/vf_bwdif_cuda.c | 1 - libavfilter/vf_bwdif_vulkan.c | 1 - libavfilter/vf_cas.c | 1 - libavfilter/vf_ccrepack.c | 1 - libavfilter/vf_chromaber_vulkan.c | 1 - libavfilter/vf_chromakey.c | 1 - libavfilter/vf_chromakey_cuda.c | 1 - libavfilter/vf_chromanr.c | 1 - libavfilter/vf_chromashift.c | 1 - libavfilter/vf_ciescope.c | 1 - libavfilter/vf_codecview.c | 1 - libavfilter/vf_colorbalance.c | 1 - libavfilter/vf_colorchannelmixer.c | 1 - libavfilter/vf_colorconstancy.c | 1 - libavfilter/vf_colorcontrast.c | 1 - libavfilter/vf_colorcorrect.c | 1 - libavfilter/vf_colorize.c | 1 - libavfilter/vf_colorkey.c | 1 - libavfilter/vf_colorkey_opencl.c | 1 - libavfilter/vf_colorlevels.c | 1 - libavfilter/vf_colormap.c | 1 - libavfilter/vf_colormatrix.c | 1 - libavfilter/vf_colorspace.c | 1 - libavfilter/vf_colorspace_cuda.c | 1 - libavfilter/vf_colortemperature.c | 1 - libavfilter/vf_convolution.c | 1 - libavfilter/vf_convolution_opencl.c | 1 - libavfilter/vf_convolve.c | 1 - libavfilter/vf_copy.c | 1 - libavfilter/vf_coreimage.m | 1 - libavfilter/vf_corr.c | 1 - libavfilter/vf_cover_rect.c | 1 - libavfilter/vf_crop.c | 1 - libavfilter/vf_cropdetect.c | 1 - libavfilter/vf_curves.c | 1 - libavfilter/vf_datascope.c | 1 - libavfilter/vf_dblur.c | 1 - libavfilter/vf_dctdnoiz.c | 1 - libavfilter/vf_deband.c | 1 - libavfilter/vf_deblock.c | 1 - libavfilter/vf_decimate.c | 1 - libavfilter/vf_dedot.c | 1 - libavfilter/vf_deflicker.c | 1 - libavfilter/vf_deinterlace_vaapi.c | 1 - libavfilter/vf_dejudder.c | 1 - libavfilter/vf_delogo.c | 1 - libavfilter/vf_derain.c | 1 - libavfilter/vf_deshake.c | 1 - libavfilter/vf_deshake_opencl.c | 1 - libavfilter/vf_despill.c | 1 - libavfilter/vf_detelecine.c | 1 - libavfilter/vf_displace.c | 1 - libavfilter/vf_dnn_classify.c | 1 - libavfilter/vf_dnn_detect.c | 1 - libavfilter/vf_dnn_processing.c | 1 - libavfilter/vf_drawbox.c | 1 - libavfilter/vf_drawbox_vaapi.c | 1 - libavfilter/vf_drawtext.c | 1 - libavfilter/vf_edgedetect.c | 1 - libavfilter/vf_elbg.c | 1 - libavfilter/vf_entropy.c | 1 - libavfilter/vf_epx.c | 1 - libavfilter/vf_eq.c | 1 - libavfilter/vf_estdif.c | 1 - libavfilter/vf_exposure.c | 1 - libavfilter/vf_extractplanes.c | 1 - libavfilter/vf_fade.c | 1 - libavfilter/vf_feedback.c | 1 - libavfilter/vf_fftdnoiz.c | 1 - libavfilter/vf_fftfilt.c | 1 - libavfilter/vf_field.c | 1 - libavfilter/vf_fieldhint.c | 1 - libavfilter/vf_fieldmatch.c | 1 - libavfilter/vf_fieldorder.c | 1 - libavfilter/vf_fillborders.c | 1 - libavfilter/vf_find_rect.c | 1 - libavfilter/vf_flip_vulkan.c | 1 - libavfilter/vf_floodfill.c | 1 - libavfilter/vf_format.c | 1 - libavfilter/vf_fps.c | 1 - libavfilter/vf_framepack.c | 1 - libavfilter/vf_framerate.c | 1 - libavfilter/vf_framestep.c | 1 - libavfilter/vf_freezeframes.c | 1 - libavfilter/vf_frei0r.c | 1 - libavfilter/vf_fspp.c | 1 - libavfilter/vf_gblur.c | 1 - libavfilter/vf_gblur_vulkan.c | 1 - libavfilter/vf_geq.c | 1 - libavfilter/vf_gradfun.c | 1 - libavfilter/vf_grayworld.c | 1 - libavfilter/vf_guided.c | 1 - libavfilter/vf_hflip.c | 1 - libavfilter/vf_histeq.c | 1 - libavfilter/vf_histogram.c | 1 - libavfilter/vf_hqdn3d.c | 1 - libavfilter/vf_hqx.c | 1 - libavfilter/vf_hsvkey.c | 1 - libavfilter/vf_hue.c | 1 - libavfilter/vf_huesaturation.c | 1 - libavfilter/vf_hwdownload.c | 1 - libavfilter/vf_hwmap.c | 1 - libavfilter/vf_hwupload.c | 1 - libavfilter/vf_hwupload_cuda.c | 1 - libavfilter/vf_hysteresis.c | 1 - libavfilter/vf_iccdetect.c | 1 - libavfilter/vf_iccgen.c | 1 - libavfilter/vf_identity.c | 1 - libavfilter/vf_idet.c | 1 - libavfilter/vf_il.c | 1 - libavfilter/vf_kerndeint.c | 1 - libavfilter/vf_lagfun.c | 1 - libavfilter/vf_lenscorrection.c | 1 - libavfilter/vf_lensfun.c | 1 - libavfilter/vf_libopencv.c | 1 - libavfilter/vf_libplacebo.c | 1 - libavfilter/vf_libvmaf.c | 1 - libavfilter/vf_limitdiff.c | 1 - libavfilter/vf_limiter.c | 1 - libavfilter/vf_lumakey.c | 1 - libavfilter/vf_lut.c | 1 - libavfilter/vf_lut2.c | 1 - libavfilter/vf_lut3d.c | 1 - libavfilter/vf_maskedclamp.c | 1 - libavfilter/vf_maskedmerge.c | 1 - libavfilter/vf_maskedminmax.c | 1 - libavfilter/vf_maskedthreshold.c | 1 - libavfilter/vf_maskfun.c | 1 - libavfilter/vf_mcdeint.c | 1 - libavfilter/vf_median.c | 1 - libavfilter/vf_mergeplanes.c | 1 - libavfilter/vf_mestimate.c | 1 - libavfilter/vf_midequalizer.c | 1 - libavfilter/vf_minterpolate.c | 1 - libavfilter/vf_misc_vaapi.c | 1 - libavfilter/vf_mix.c | 1 - libavfilter/vf_monochrome.c | 1 - libavfilter/vf_morpho.c | 1 - libavfilter/vf_mpdecimate.c | 1 - libavfilter/vf_multiply.c | 1 - libavfilter/vf_negate.c | 1 - libavfilter/vf_neighbor.c | 1 - libavfilter/vf_neighbor_opencl.c | 1 - libavfilter/vf_nlmeans.c | 1 - libavfilter/vf_nlmeans_opencl.c | 1 - libavfilter/vf_nlmeans_vulkan.c | 1 - libavfilter/vf_nnedi.c | 1 - libavfilter/vf_noise.c | 1 - libavfilter/vf_normalize.c | 1 - libavfilter/vf_null.c | 1 - libavfilter/vf_ocr.c | 1 - libavfilter/vf_overlay.c | 1 - libavfilter/vf_overlay_cuda.c | 1 - libavfilter/vf_overlay_opencl.c | 1 - libavfilter/vf_overlay_qsv.c | 1 - libavfilter/vf_overlay_vaapi.c | 1 - libavfilter/vf_overlay_vulkan.c | 1 - libavfilter/vf_owdenoise.c | 1 - libavfilter/vf_pad.c | 1 - libavfilter/vf_pad_opencl.c | 1 - libavfilter/vf_pad_vaapi.c | 1 - libavfilter/vf_palettegen.c | 1 - libavfilter/vf_paletteuse.c | 1 - libavfilter/vf_perspective.c | 1 - libavfilter/vf_phase.c | 1 - libavfilter/vf_photosensitivity.c | 1 - libavfilter/vf_pixdesctest.c | 1 - libavfilter/vf_pixelize.c | 1 - libavfilter/vf_pp.c | 1 - libavfilter/vf_pp7.c | 1 - libavfilter/vf_premultiply.c | 1 - libavfilter/vf_procamp_vaapi.c | 1 - libavfilter/vf_program_opencl.c | 1 - libavfilter/vf_pseudocolor.c | 1 - libavfilter/vf_psnr.c | 1 - libavfilter/vf_pullup.c | 1 - libavfilter/vf_qp.c | 1 - libavfilter/vf_random.c | 1 - libavfilter/vf_readeia608.c | 1 - libavfilter/vf_readvitc.c | 1 - libavfilter/vf_remap.c | 1 - libavfilter/vf_remap_opencl.c | 1 - libavfilter/vf_removegrain.c | 1 - libavfilter/vf_removelogo.c | 1 - libavfilter/vf_repeatfields.c | 1 - libavfilter/vf_rotate.c | 1 - libavfilter/vf_sab.c | 1 - libavfilter/vf_scale.c | 1 - libavfilter/vf_scale_cuda.c | 1 - libavfilter/vf_scale_npp.c | 1 - libavfilter/vf_scale_vaapi.c | 1 - libavfilter/vf_scale_vt.c | 1 - libavfilter/vf_scale_vulkan.c | 1 - libavfilter/vf_scroll.c | 1 - libavfilter/vf_selectivecolor.c | 1 - libavfilter/vf_separatefields.c | 1 - libavfilter/vf_setparams.c | 1 - libavfilter/vf_sharpen_npp.c | 1 - libavfilter/vf_shear.c | 1 - libavfilter/vf_showinfo.c | 1 - libavfilter/vf_showpalette.c | 1 - libavfilter/vf_shuffleframes.c | 1 - libavfilter/vf_shufflepixels.c | 1 - libavfilter/vf_shuffleplanes.c | 1 - libavfilter/vf_signalstats.c | 1 - libavfilter/vf_signature.c | 1 - libavfilter/vf_siti.c | 1 - libavfilter/vf_smartblur.c | 1 - libavfilter/vf_spp.c | 1 - libavfilter/vf_sr.c | 1 - libavfilter/vf_ssim.c | 1 - libavfilter/vf_ssim360.c | 1 - libavfilter/vf_stack.c | 1 - libavfilter/vf_stack_qsv.c | 1 - libavfilter/vf_stack_vaapi.c | 1 - libavfilter/vf_stereo3d.c | 1 - libavfilter/vf_subtitles.c | 1 - libavfilter/vf_super2xsai.c | 1 - libavfilter/vf_swaprect.c | 1 - libavfilter/vf_swapuv.c | 1 - libavfilter/vf_telecine.c | 1 - libavfilter/vf_threshold.c | 1 - libavfilter/vf_thumbnail.c | 1 - libavfilter/vf_thumbnail_cuda.c | 1 - libavfilter/vf_tile.c | 1 - libavfilter/vf_tiltandshift.c | 1 - libavfilter/vf_tinterlace.c | 1 - libavfilter/vf_tmidequalizer.c | 1 - libavfilter/vf_tonemap.c | 1 - libavfilter/vf_tonemap_opencl.c | 1 - libavfilter/vf_tonemap_vaapi.c | 1 - libavfilter/vf_tpad.c | 1 - libavfilter/vf_transpose.c | 1 - libavfilter/vf_transpose_npp.c | 1 - libavfilter/vf_transpose_opencl.c | 1 - libavfilter/vf_transpose_vaapi.c | 1 - libavfilter/vf_transpose_vt.c | 1 - libavfilter/vf_transpose_vulkan.c | 1 - libavfilter/vf_unsharp.c | 1 - libavfilter/vf_unsharp_opencl.c | 1 - libavfilter/vf_uspp.c | 1 - libavfilter/vf_v360.c | 1 - libavfilter/vf_vaguedenoiser.c | 1 - libavfilter/vf_varblur.c | 1 - libavfilter/vf_vectorscope.c | 1 - libavfilter/vf_vflip.c | 1 - libavfilter/vf_vfrdet.c | 1 - libavfilter/vf_vibrance.c | 1 - libavfilter/vf_vidstabdetect.c | 1 - libavfilter/vf_vidstabtransform.c | 1 - libavfilter/vf_vif.c | 1 - libavfilter/vf_vignette.c | 1 - libavfilter/vf_vmafmotion.c | 1 - libavfilter/vf_vpp_qsv.c | 1 - libavfilter/vf_w3fdif.c | 1 - libavfilter/vf_waveform.c | 1 - libavfilter/vf_weave.c | 1 - libavfilter/vf_xbr.c | 1 - libavfilter/vf_xfade.c | 1 - libavfilter/vf_xfade_opencl.c | 1 - libavfilter/vf_xfade_vulkan.c | 1 - libavfilter/vf_xmedian.c | 1 - libavfilter/vf_yadif.c | 1 - libavfilter/vf_yadif_cuda.c | 1 - libavfilter/vf_yadif_videotoolbox.m | 1 - libavfilter/vf_yaepblur.c | 1 - libavfilter/vf_zoompan.c | 1 - libavfilter/vf_zscale.c | 1 - libavfilter/video.c | 1 - libavfilter/vsink_nullsink.c | 1 - libavfilter/vsrc_cellauto.c | 1 - libavfilter/vsrc_ddagrab.c | 1 - libavfilter/vsrc_gradients.c | 1 - libavfilter/vsrc_life.c | 1 - libavfilter/vsrc_mandelbrot.c | 1 - libavfilter/vsrc_mptestsrc.c | 1 - libavfilter/vsrc_perlin.c | 1 - libavfilter/vsrc_sierpinski.c | 1 - libavfilter/vsrc_testsrc.c | 1 - libavfilter/vsrc_testsrc_vulkan.c | 1 - libavfilter/yadif_common.c | 1 - 452 files changed, 24 insertions(+), 503 deletions(-) delete mode 100644 libavfilter/internal.h diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c index d5ea375a6d..9fb6354ed3 100644 --- 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 diff --git a/libavfilter/af_aap.c b/libavfilter/af_aap.c index e4cd6f8281..352f10cd8c 100644 --- 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, diff --git a/libavfilter/af_acopy.c b/libavfilter/af_acopy.c index 62faa9004c..9d06e2d4b4 100644 --- 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) { diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 04cdf8f005..48ff002006 100644 --- 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 diff --git a/libavfilter/af_acrusher.c b/libavfilter/af_acrusher.c index 7c1f8706aa..f064f5b04e 100644 --- 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 { diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index a5ae1d872b..819ad2ab5c 100644 --- 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; diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index 8c4d4db287..ab2d660446 100644 --- 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; diff --git a/libavfilter/af_adenorm.c b/libavfilter/af_adenorm.c index 4182dd67f5..7dc3c0f735 100644 --- 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, diff --git a/libavfilter/af_aderivative.c b/libavfilter/af_aderivative.c index 667bcee50a..1254aa9457 100644 --- 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; diff --git a/libavfilter/af_adrc.c b/libavfilter/af_adrc.c index e11db05f70..7410b99ed3 100644 --- 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 diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c index 68fa5aaf7b..b1c656e034 100644 --- 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; diff --git a/libavfilter/af_aemphasis.c b/libavfilter/af_aemphasis.c index 58931ad92b..4bde916717 100644 --- 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 { diff --git a/libavfilter/af_aexciter.c b/libavfilter/af_aexciter.c index 76a191dd87..3fe7ce799b 100644 --- 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 { diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index c79271ec92..7cc5182d1a 100644 --- 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; diff --git a/libavfilter/af_afftfilt.c b/libavfilter/af_afftfilt.c index aa3e868caf..98b09e666d 100644 --- 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" diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 4867bfba24..8ab4d544a8 100644 --- 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 diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 6e0f88dbb0..b4cf5f1426 100644 --- 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; diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 9704a9e0a3..462fa4666e 100644 --- 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 { diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index 0150fd2d86..a08616f69c 100644 --- 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; diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 67c87d1d9e..16507299b5 100644 --- 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 diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index ade4ef76a8..bc97200926 100644 --- 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) */ diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index b24254e9dc..5090098c1b 100644 --- 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; diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index f50d0a034a..fdc9404857 100644 --- 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" diff --git a/libavfilter/af_anlmdndsp.h b/libavfilter/af_anlmdndsp.h index d8f5136cd8..4b4c3d8b6b 100644 --- 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); diff --git a/libavfilter/af_anlms.c b/libavfilter/af_anlms.c index e1c85da053..1764b01072 100644 --- 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, diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c index 3ff45aa40f..d7645fd0ec 100644 --- 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 = { diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c index 1e0ecd201e..6cdfd15972 100644 --- 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; diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c index 7ed7d53bff..b070f4d2a6 100644 --- 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 { diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c index b542166b56..5afc3930c1 100644 --- 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; diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c index 6774e90607..4487bec956 100644 --- 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 }; diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 8ff2fe5973..2a67b06260 100644 --- 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; diff --git a/libavfilter/af_arls.c b/libavfilter/af_arls.c index aab0990409..de50da6473 100644 --- 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, diff --git a/libavfilter/af_asdr.c b/libavfilter/af_asdr.c index 9f5ca80d78..7765690fd8 100644 --- 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; diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index a12e6cadf9..3d2d99dae2 100644 --- 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; diff --git a/libavfilter/af_asetrate.c b/libavfilter/af_asetrate.c index 7510fc7c31..80f76fbb70 100644 --- 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; diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 9ca97c609f..b83847b866 100644 --- 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 { /** diff --git a/libavfilter/af_aspectralstats.c b/libavfilter/af_aspectralstats.c index 592d7e5530..ca79395514 100644 --- 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 diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c index dd95745179..e19b7c3be2 100644 --- 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; diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index dcdeff175d..62ebc3f83b 100644 --- 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) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index c3f87db05e..3b03caa4d0 100644 --- 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 diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c index 82a36f257d..b887c07bfb 100644 --- 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; diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index 21d3acf850..784782f14d 100644 --- 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, diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c index e8c1a6ab88..d6a974051e 100644 --- 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); diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 4c7c269ae7..8d65fb3cd2 100644 --- 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; diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index b91195a4c6..63ffdc3d9b 100644 --- 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 diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c index a53977b417..7b3f5be9ab 100644 --- 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 { diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 527b2260b4..1aedc0f6bb 100644 --- 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; diff --git a/libavfilter/af_compensationdelay.c b/libavfilter/af_compensationdelay.c index 1236a6ae8c..9d307fd1f3 100644 --- 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; diff --git a/libavfilter/af_dcshift.c b/libavfilter/af_dcshift.c index 784bba0fe0..bea15e51d9 100644 --- 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; diff --git a/libavfilter/af_dialoguenhance.c b/libavfilter/af_dialoguenhance.c index 76c9877238..b77e85198f 100644 --- 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 diff --git a/libavfilter/af_drmeter.c b/libavfilter/af_drmeter.c index 3292736a9a..e5859e9d82 100644 --- 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 diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index a3d3c47d17..90b3f8bbee 100644 --- 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 diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index b889872775..386d8cd242 100644 --- 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 diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c index add1e9e9ad..092ffcaa23 100644 --- 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 diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index 90831d5b2a..40d62c8793 100644 --- 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 */ diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c index 37ed9b84a1..f97f329293 100644 --- 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 diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 4a4fc04d0d..e1d8b0e00c 100644 --- 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 diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c index cb90b8f5ae..2f8c92cd14 100644 --- 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; diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c index dd5edec1c8..d28c4556df 100644 --- 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" diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c index f9425a5828..7e8ab4de03 100644 --- 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; diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index 60b21c12dc..b2f61fc5f9 100644 --- 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; diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 501cb4b7fa..02a899b88e 100644 --- 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 diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c index e7b0330e6c..072ffa2aea 100644 --- 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 diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c index a820ba7538..cf055f77d0 100644 --- 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; diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index d152a82953..80c6e3cab1 100644 --- 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; diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index a481f40dfa..9bb17400e7 100644 --- 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; diff --git a/libavfilter/af_silenceremove.c b/libavfilter/af_silenceremove.c index eb23e78957..3cc518a7eb 100644 --- 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, diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c index 4bf54014a3..e647d2fe4e 100644 --- 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 diff --git a/libavfilter/af_speechnorm.c b/libavfilter/af_speechnorm.c index e6a8a95829..840c432c1a 100644 --- 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.) diff --git a/libavfilter/af_superequalizer.c b/libavfilter/af_superequalizer.c index c532048406..bdf6e12afe 100644 --- 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 diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index d42a23b8ad..111af03335 100644 --- 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" diff --git a/libavfilter/af_tremolo.c b/libavfilter/af_tremolo.c index ae2ba77a37..0c781a2de3 100644 --- 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 { diff --git a/libavfilter/af_vibrato.c b/libavfilter/af_vibrato.c index a135490df8..a3bf90ae8e 100644 --- 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" diff --git a/libavfilter/af_virtualbass.c b/libavfilter/af_virtualbass.c index 9b9967c419..232e5fe48a 100644 --- 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 diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c index 827415fc1c..d2f8a1c1fa 100644 --- 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[] = { diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c index a2cf5db637..25f7bf5695 100644 --- 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 { /** diff --git a/libavfilter/afir_template.c b/libavfilter/afir_template.c index 08e1ca4692..c45b29902e 100644 --- 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 diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c index 162f951d23..5ba1c7288d 100644 --- 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) { diff --git a/libavfilter/asrc_afdelaysrc.c b/libavfilter/asrc_afdelaysrc.c index 827da53780..c235f0c27a 100644 --- 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; diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c index f8040b4404..bc450ec822 100644 --- 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 { diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index d98bc4fc8a..a67b2abe9c 100644 --- 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" diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index a48728eaf0..3249cc33ad 100644 --- 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; diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c index 4327341098..5962bf55bb 100644 --- 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; diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c index 0ca8e0c9d5..e38af7123b 100644 --- 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" diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c index a16d8285af..94046f76b9 100644 --- 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; diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c index bbfe37ba53..2e444ba196 100644 --- 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; diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 11b3d0c9c3..7d87e9e9a0 100644 --- 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] = { { diff --git a/libavfilter/avf_a3dscope.c b/libavfilter/avf_a3dscope.c index 27eb73effb..dd08990512 100644 --- 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; diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c index 749c78fe14..30ed7d95e3 100644 --- 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; diff --git a/libavfilter/avf_ahistogram.c b/libavfilter/avf_ahistogram.c index 23239b1b72..b77307f137 100644 --- 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 }; diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index bf7ae0823f..fe0968c974 100644 --- 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; diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c index be5656f13b..96bef32e2c 100644 --- 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, diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 67cdc39fd8..2a3d4c8b52 100644 --- 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" diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index fa0c82e996..00f679bc9e 100644 --- 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" diff --git a/libavfilter/avf_showcqt.h b/libavfilter/avf_showcqt.h index b6c1e0e108..186215c1e2 100644 --- 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; diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index c6fa8ac821..760a07f2ff 100644 --- 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, diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index 245d62dec4..da31b3215e 100644 --- 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 }; diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c index ef67340465..f7380f885a 100644 --- 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 { diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index cb2a5a6ae3..565f23c28b 100644 --- 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 }; diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c index 06550157fd..d26fc8841d 100644 --- 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 }; diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 823f1c6fd3..868e6a22d9 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -37,7 +37,6 @@ #include "formats.h" #include "audio.h" #include "video.h" -#include "internal.h" enum ShowWavesMode { MODE_POINT, diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 43d7c9f4ab..c89a7ab508 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -42,7 +42,6 @@ #include "formats.h" #include "framequeue.h" #include "framepool.h" -#include "internal.h" #include "video.h" static void tlog_ref(void *ctx, AVFrame *ref, int end) diff --git a/libavfilter/avfilter_internal.h b/libavfilter/avfilter_internal.h index 974024254f..3b8d6fe60e 100644 --- a/libavfilter/avfilter_internal.h +++ b/libavfilter/avfilter_internal.h @@ -161,4 +161,27 @@ int ff_graph_thread_init(FFFilterGraph *graph); void ff_graph_thread_free(FFFilterGraph *graph); +/** + * Negotiate the media format, dimensions, etc of all inputs to a filter. + * + * @param filter the filter to negotiate the properties for its inputs + * @return zero on successful negotiation + */ +int ff_filter_config_links(AVFilterContext *filter); + +/* misc trace functions */ + +#define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func) + +#ifdef TRACE +void ff_tlog_link(void *ctx, AVFilterLink *link, int end); +#else +#define ff_tlog_link(ctx, link, end) do { } while(0) +#endif + +/** + * Run one round of processing on a filter graph. + */ +int ff_filter_graph_run_once(AVFilterGraph *graph); + #endif /* AVFILTER_AVFILTER_INTERNAL_H */ diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 6317f8d457..68e392b826 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -39,7 +39,6 @@ #include "filters.h" #include "formats.h" #include "framequeue.h" -#include "internal.h" #include "video.h" #define OFFSET(x) offsetof(AVFilterGraph, x) diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes.c index def5ae8e0d..9b1e78b146 100644 --- a/libavfilter/blend_modes.c +++ b/libavfilter/blend_modes.c @@ -21,7 +21,6 @@ #include "libavutil/common.h" #include "libavutil/intfloat.h" #include "avfilter.h" -#include "internal.h" #include "video.h" #include "blend.h" diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index bc4c4ebd43..5811720c61 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -37,7 +37,6 @@ #include "filters.h" #include "formats.h" #include "framequeue.h" -#include "internal.h" #include "video.h" typedef struct BufferSinkContext { diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 1cf23fe37b..a3113f5c13 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -35,10 +35,10 @@ #include "libavutil/samplefmt.h" #include "libavutil/timestamp.h" #include "avfilter.h" +#include "avfilter_internal.h" #include "buffersrc.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct BufferSourceContext { diff --git a/libavfilter/dialoguenhance_template.c b/libavfilter/dialoguenhance_template.c index 07f42f0958..d95d7dba50 100644 --- a/libavfilter/dialoguenhance_template.c +++ b/libavfilter/dialoguenhance_template.c @@ -19,7 +19,6 @@ #include "libavutil/mem.h" #include "libavutil/tx.h" #include "avfilter.h" -#include "internal.h" #include "audio.h" #undef ctype diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 9c699cdc8c..2f6706dcd4 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -31,7 +31,6 @@ #include "libavutil/opt.h" #include "libavutil/avstring.h" #include "libavutil/detection_bbox.h" -#include "../internal.h" #include "safe_queue.h" #if HAVE_OPENVINO2 #include diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 6afefe8115..6ca7fb6910 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -30,7 +30,6 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavcodec/defs.h" -#include "../internal.h" #include "dnn_io_proc.h" #include "dnn_backend_common.h" #include "safe_queue.h" diff --git a/libavfilter/dnn/dnn_backend_torch.cpp b/libavfilter/dnn/dnn_backend_torch.cpp index ea493f5873..2e4326d9d4 100644 --- a/libavfilter/dnn/dnn_backend_torch.cpp +++ b/libavfilter/dnn/dnn_backend_torch.cpp @@ -27,7 +27,6 @@ #include extern "C" { -#include "../internal.h" #include "dnn_io_proc.h" #include "dnn_backend_common.h" #include "libavutil/opt.h" diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index abd07d8de1..bb477348dc 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -29,7 +29,6 @@ #include "libavutil/opt.h" #include "libavfilter/filters.h" -#include "libavfilter/internal.h" extern const DNNModule ff_dnn_backend_openvino; extern const DNNModule ff_dnn_backend_tf; diff --git a/libavfilter/edge_template.c b/libavfilter/edge_template.c index ce45e579db..100fe1e425 100644 --- a/libavfilter/edge_template.c +++ b/libavfilter/edge_template.c @@ -22,7 +22,6 @@ #include "libavutil/avassert.h" #include "avfilter.h" -#include "internal.h" #include "video.h" #undef pixel diff --git a/libavfilter/f_bench.c b/libavfilter/f_bench.c index 0e60b40c43..3f1fa23ae4 100644 --- a/libavfilter/f_bench.c +++ b/libavfilter/f_bench.c @@ -23,7 +23,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum BenchAction { diff --git a/libavfilter/f_cue.c b/libavfilter/f_cue.c index 7748e8f1fd..38500bb515 100644 --- a/libavfilter/f_cue.c +++ b/libavfilter/f_cue.c @@ -25,7 +25,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct CueContext { diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index 8144a9c385..7c6a83be7d 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -28,7 +28,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct DrawGraphContext { diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index b2495aed9b..f71c230b45 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -41,7 +41,6 @@ #include "avfilter.h" #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 diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index c02a205e7e..0ed1085610 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct CacheItem { diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index e989fbc927..1bfd002ba0 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "audio.h" #include "video.h" diff --git a/libavfilter/f_latency.c b/libavfilter/f_latency.c index 5315545873..85bdc4a1f6 100644 --- a/libavfilter/f_latency.c +++ b/libavfilter/f_latency.c @@ -23,7 +23,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct LatencyContext { diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c index 51cf2dbf4d..9b01a85405 100644 --- a/libavfilter/f_loop.c +++ b/libavfilter/f_loop.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "audio.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct LoopContext { diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index e18d477850..1a72284790 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -37,7 +37,6 @@ #include "avfilter.h" #include "audio.h" #include "filters.h" -#include "internal.h" #include "video.h" enum MetadataMode { diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c index 319be8dd10..d85bef571e 100644 --- a/libavfilter/f_realtime.c +++ b/libavfilter/f_realtime.c @@ -25,7 +25,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index 0eee7c2588..a939ca751d 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -23,7 +23,6 @@ #include "libavutil/mem.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #define DEFAULT_LENGTH 300 diff --git a/libavfilter/f_segment.c b/libavfilter/f_segment.c index f655c1e675..4bcda427a0 100644 --- a/libavfilter/f_segment.c +++ b/libavfilter/f_segment.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" typedef struct SegmentContext { const AVClass *class; diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index d834397ea6..6ba96bd7c5 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -36,7 +36,6 @@ #include "audio.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "scene_sad.h" diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 8ba0878e81..f895271629 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -34,7 +34,6 @@ #include "libavutil/parseutils.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "audio.h" #include "video.h" diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index 2d0c080c3e..23dffec803 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -30,7 +30,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum SideDataMode { diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index ecdcc7f269..4ff4e856ea 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -25,7 +25,6 @@ #include "filters.h" #include "formats.h" #include "framesync.h" -#include "internal.h" #include "video.h" typedef struct StreamSelectContext { diff --git a/libavfilter/f_zmq.c b/libavfilter/f_zmq.c index aa5c692b62..912d29d96c 100644 --- a/libavfilter/f_zmq.c +++ b/libavfilter/f_zmq.c @@ -31,7 +31,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "audio.h" #include "video.h" diff --git a/libavfilter/filters.h b/libavfilter/filters.h index e78029a1b7..4e763a94c0 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -26,7 +26,6 @@ */ #include "avfilter.h" -#include "internal.h" /** * Special return code when activate() did not do anything. diff --git a/libavfilter/formats.c b/libavfilter/formats.c index cd7c68f592..eabc3ec946 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "formats.h" /** diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c index a13f6981d0..1bb59e4301 100644 --- a/libavfilter/graphdump.c +++ b/libavfilter/graphdump.c @@ -27,7 +27,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" static int print_link_prop(AVBPrint *buf, AVFilterLink *link) { diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 81267364bd..912804ecd6 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "avfilter_internal.h" #include "filters.h" -#include "internal.h" #define WHITESPACES " \n\t\r" diff --git a/libavfilter/internal.h b/libavfilter/internal.h deleted file mode 100644 index 6a0b9ed7e1..0000000000 --- a/libavfilter/internal.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVFILTER_INTERNAL_H -#define AVFILTER_INTERNAL_H - -/** - * @file - * internal API functions - */ - -#include "libavutil/internal.h" -#include "avfilter.h" - -/** - * Negotiate the media format, dimensions, etc of all inputs to a filter. - * - * @param filter the filter to negotiate the properties for its inputs - * @return zero on successful negotiation - */ -int ff_filter_config_links(AVFilterContext *filter); - -/* misc trace functions */ - -#define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func) - -#ifdef TRACE -void ff_tlog_link(void *ctx, AVFilterLink *link, int end); -#else -#define ff_tlog_link(ctx, link, end) do { } while(0) -#endif - -/** - * Run one round of processing on a filter graph. - */ -int ff_filter_graph_run_once(AVFilterGraph *graph); - -#endif /* AVFILTER_INTERNAL_H */ diff --git a/libavfilter/median_template.c b/libavfilter/median_template.c index 760a0278c9..6f719df57f 100644 --- a/libavfilter/median_template.c +++ b/libavfilter/median_template.c @@ -22,7 +22,6 @@ #include "libavutil/avassert.h" #include "avfilter.h" -#include "internal.h" #include "video.h" #undef pixel diff --git a/libavfilter/phase_template.c b/libavfilter/phase_template.c index c25bc88415..971cb4e34f 100644 --- a/libavfilter/phase_template.c +++ b/libavfilter/phase_template.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "avfilter.h" -#include "internal.h" #include "video.h" #undef pixel diff --git a/libavfilter/qrencode.c b/libavfilter/qrencode.c index d184ac994d..dae169b57f 100644 --- a/libavfilter/qrencode.c +++ b/libavfilter/qrencode.c @@ -40,7 +40,6 @@ #include "avfilter.h" #include "drawutils.h" -#include "internal.h" #include "filters.h" #include "formats.h" #include "textutils.h" diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 3f6f4620b6..0818ada117 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -27,7 +27,6 @@ #include "libavutil/time.h" #include "libavutil/pixdesc.h" -#include "internal.h" #include "filters.h" #include "qsvvpp.h" #include "video.h" diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 9931387c61..b92573a7fa 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -36,7 +36,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/settb.c b/libavfilter/settb.c index ba58abd9e9..e6a2272834 100644 --- a/libavfilter/settb.c +++ b/libavfilter/settb.c @@ -37,7 +37,6 @@ #include "audio.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/signature.h b/libavfilter/signature.h index cc198dbaa0..c6b57cc053 100644 --- a/libavfilter/signature.h +++ b/libavfilter/signature.h @@ -31,7 +31,6 @@ #include "libavutil/opt.h" #include "libavutil/timestamp.h" #include "avfilter.h" -#include "internal.h" #define ELEMENT_COUNT 10 #define SIGELEM_SIZE 380 diff --git a/libavfilter/split.c b/libavfilter/split.c index 7935f2d518..8309cdb4ea 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "audio.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct SplitContext { diff --git a/libavfilter/src_avsynctest.c b/libavfilter/src_avsynctest.c index f69ae08b84..f78cdd1dec 100644 --- a/libavfilter/src_avsynctest.c +++ b/libavfilter/src_avsynctest.c @@ -32,7 +32,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "audio.h" #include "video.h" diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index e6e08cdda4..e7817c7ee7 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -45,7 +45,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct MovieStream { diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 194792078d..bc8c65c0ad 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -29,7 +29,6 @@ #include "libavfilter/avfilter_internal.h" #include "libavfilter/formats.h" #include "libavfilter/framequeue.h" -#include "libavfilter/internal.h" static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads, unsigned nb, size_t fmts_cfg_offset, diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 4afc4c74bb..a795d7541b 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -30,7 +30,6 @@ #include "audio.h" #include "avfilter.h" -#include "internal.h" #include "filters.h" #include "video.h" diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c index 496190a844..0179977af4 100644 --- a/libavfilter/vaapi_vpp.c +++ b/libavfilter/vaapi_vpp.c @@ -24,7 +24,6 @@ #include "filters.h" #include "formats.h" -#include "internal.h" #include "vaapi_vpp.h" int ff_vaapi_vpp_query_formats(AVFilterContext *avctx) diff --git a/libavfilter/vaf_spectrumsynth.c b/libavfilter/vaf_spectrumsynth.c index 027b9c6842..a62151aa4f 100644 --- a/libavfilter/vaf_spectrumsynth.c +++ b/libavfilter/vaf_spectrumsynth.c @@ -34,7 +34,6 @@ #include "formats.h" #include "audio.h" #include "filters.h" -#include "internal.h" #include "window_func.h" enum MagnitudeScale { LINEAR, LOG, NB_SCALES }; diff --git a/libavfilter/vf_addroi.c b/libavfilter/vf_addroi.c index a07be2b426..de857eced4 100644 --- a/libavfilter/vf_addroi.c +++ b/libavfilter/vf_addroi.c @@ -21,7 +21,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum { diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index f3fc1529aa..2abb7e5583 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -33,7 +33,6 @@ #include "formats.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" enum { Y, U, V, A }; diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c index 0c0e15bde4..69d751593f 100644 --- a/libavfilter/vf_amplify.c +++ b/libavfilter/vf_amplify.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct AmplifyContext { diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index e43a1c7c89..5b4b9fd6e5 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -36,7 +36,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/vf_atadenoise.c b/libavfilter/vf_atadenoise.c index 81ca644575..bb60ce8490 100644 --- a/libavfilter/vf_atadenoise.c +++ b/libavfilter/vf_atadenoise.c @@ -35,7 +35,6 @@ #include "atadenoise.h" #include "filters.h" -#include "internal.h" #include "video.h" #define SIZE FF_BUFQUEUE_SIZE diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index b51c19dd79..013d83b1be 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -27,7 +27,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct AverageBlurContext { diff --git a/libavfilter/vf_avgblur_opencl.c b/libavfilter/vf_avgblur_opencl.c index 07be4b574c..0790f25a28 100644 --- a/libavfilter/vf_avgblur_opencl.c +++ b/libavfilter/vf_avgblur_opencl.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 7599f251b0..439766968e 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -24,7 +24,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct AvgBlurVulkanContext { diff --git a/libavfilter/vf_backgroundkey.c b/libavfilter/vf_backgroundkey.c index 444ec30600..4a6ee5380d 100644 --- a/libavfilter/vf_backgroundkey.c +++ b/libavfilter/vf_backgroundkey.c @@ -21,7 +21,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct BackgroundkeyContext { diff --git a/libavfilter/vf_bbox.c b/libavfilter/vf_bbox.c index 2f6edf9393..b4f74dca68 100644 --- a/libavfilter/vf_bbox.c +++ b/libavfilter/vf_bbox.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "bbox.h" #include "filters.h" -#include "internal.h" typedef struct BBoxContext { const AVClass *class; diff --git a/libavfilter/vf_bilateral.c b/libavfilter/vf_bilateral.c index 010c291dfc..66cc56d1c4 100644 --- a/libavfilter/vf_bilateral.c +++ b/libavfilter/vf_bilateral.c @@ -27,7 +27,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct BilateralContext { diff --git a/libavfilter/vf_bilateral_cuda.c b/libavfilter/vf_bilateral_cuda.c index 46acec91b9..5e13acd330 100644 --- a/libavfilter/vf_bilateral_cuda.c +++ b/libavfilter/vf_bilateral_cuda.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "cuda/load_helper.h" diff --git a/libavfilter/vf_bitplanenoise.c b/libavfilter/vf_bitplanenoise.c index 92ba1aa49b..24377d1fe6 100644 --- a/libavfilter/vf_bitplanenoise.c +++ b/libavfilter/vf_bitplanenoise.c @@ -22,7 +22,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct BPNContext { diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index 973216e883..ac74ef74ad 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -31,7 +31,6 @@ #include "libavutil/timestamp.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct BlackDetectContext { diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 8d945f89a1..7b74aa61b9 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -34,7 +34,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct BlackFrameContext { diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index a38cae2db3..2e5dc93861 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "vf_blend_init.h" #include "video.h" #include "blend.h" diff --git a/libavfilter/vf_blend_vulkan.c b/libavfilter/vf_blend_vulkan.c index 05ecfa0830..f3eb5355f1 100644 --- a/libavfilter/vf_blend_vulkan.c +++ b/libavfilter/vf_blend_vulkan.c @@ -27,7 +27,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "framesync.h" #include "blend.h" #include "video.h" diff --git a/libavfilter/vf_blockdetect.c b/libavfilter/vf_blockdetect.c index 6b1f35c974..dc6d9a922d 100644 --- a/libavfilter/vf_blockdetect.c +++ b/libavfilter/vf_blockdetect.c @@ -34,7 +34,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct BLKContext { diff --git a/libavfilter/vf_blurdetect.c b/libavfilter/vf_blurdetect.c index 2b85a9e95a..a99d61f88a 100644 --- a/libavfilter/vf_blurdetect.c +++ b/libavfilter/vf_blurdetect.c @@ -36,7 +36,6 @@ #include "libavutil/qsort.h" #include "filters.h" -#include "internal.h" #include "edge_common.h" #include "video.h" diff --git a/libavfilter/vf_bm3d.c b/libavfilter/vf_bm3d.c index 408ce20891..49597ea8fb 100644 --- a/libavfilter/vf_bm3d.c +++ b/libavfilter/vf_bm3d.c @@ -40,7 +40,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" #define MAX_NB_THREADS 32 diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index 0a1920b12b..27cf57a7c1 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "boxblur.h" diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 7b6557b2a9..d41a25f8ea 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -35,7 +35,6 @@ #include "bwdifdsp.h" #include "ccfifo.h" #include "filters.h" -#include "internal.h" #include "yadif.h" typedef struct BWDIFContext { diff --git a/libavfilter/vf_bwdif_cuda.c b/libavfilter/vf_bwdif_cuda.c index a19d180bdd..396a246710 100644 --- a/libavfilter/vf_bwdif_cuda.c +++ b/libavfilter/vf_bwdif_cuda.c @@ -24,7 +24,6 @@ #include "libavutil/cuda_check.h" #include "filters.h" -#include "internal.h" #include "yadif.h" #include "cuda/load_helper.h" diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c index 3599047784..4e43ade1c2 100644 --- a/libavfilter/vf_bwdif_vulkan.c +++ b/libavfilter/vf_bwdif_vulkan.c @@ -25,7 +25,6 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "yadif.h" -#include "internal.h" #include "filters.h" typedef struct BWDIFVulkanContext { diff --git a/libavfilter/vf_cas.c b/libavfilter/vf_cas.c index ed5e8fec34..7fc384026a 100644 --- a/libavfilter/vf_cas.c +++ b/libavfilter/vf_cas.c @@ -20,7 +20,6 @@ #include "libavutil/imgutils.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct CASContext { diff --git a/libavfilter/vf_ccrepack.c b/libavfilter/vf_ccrepack.c index a6aad87864..3e72622203 100644 --- a/libavfilter/vf_ccrepack.c +++ b/libavfilter/vf_ccrepack.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "ccfifo.h" #include "video.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_chromaber_vulkan.c b/libavfilter/vf_chromaber_vulkan.c index 39be1feb8c..60c8378b11 100644 --- a/libavfilter/vf_chromaber_vulkan.c +++ b/libavfilter/vf_chromaber_vulkan.c @@ -24,7 +24,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ChromaticAberrationVulkanContext { diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index 5671cf2ae8..659ba28559 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -23,7 +23,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" typedef struct ChromakeyContext { const AVClass *class; diff --git a/libavfilter/vf_chromakey_cuda.c b/libavfilter/vf_chromakey_cuda.c index 86da92a4ea..c59ac7b26c 100644 --- a/libavfilter/vf_chromakey_cuda.c +++ b/libavfilter/vf_chromakey_cuda.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "cuda/load_helper.h" static const enum AVPixelFormat supported_formats[] = { diff --git a/libavfilter/vf_chromanr.c b/libavfilter/vf_chromanr.c index ddf3ce30ca..6e1fba034b 100644 --- a/libavfilter/vf_chromanr.c +++ b/libavfilter/vf_chromanr.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ChromaNRContext { diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index ea07ac071f..58c4c1b5c4 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ChromaShiftContext { diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index 3eed4b22fc..260ca26187 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" enum CieSystem { diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index bd82624d87..b7396f6668 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -37,7 +37,6 @@ #include "avfilter.h" #include "filters.h" #include "qp_table.h" -#include "internal.h" #include "video.h" #define MV_P_FOR (1<<0) diff --git a/libavfilter/vf_colorbalance.c b/libavfilter/vf_colorbalance.c index 8561763a85..1c88aa4a16 100644 --- a/libavfilter/vf_colorbalance.c +++ b/libavfilter/vf_colorbalance.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c index f74b07af56..02ad3435fa 100644 --- a/libavfilter/vf_colorchannelmixer.c +++ b/libavfilter/vf_colorchannelmixer.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "preserve_color.h" diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index 1c15afb80f..035880294e 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include diff --git a/libavfilter/vf_colorcontrast.c b/libavfilter/vf_colorcontrast.c index f675924171..419f5a1e1e 100644 --- a/libavfilter/vf_colorcontrast.c +++ b/libavfilter/vf_colorcontrast.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_colorcorrect.c b/libavfilter/vf_colorcorrect.c index acc654fb23..db69a22e4e 100644 --- a/libavfilter/vf_colorcorrect.c +++ b/libavfilter/vf_colorcorrect.c @@ -25,7 +25,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef enum AnalyzeMode { diff --git a/libavfilter/vf_colorize.c b/libavfilter/vf_colorize.c index dfad9191ed..e20008e79f 100644 --- a/libavfilter/vf_colorize.c +++ b/libavfilter/vf_colorize.c @@ -20,7 +20,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ColorizeContext { diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index ce7227f4a8..343a93c1d4 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" typedef struct ColorkeyContext { const AVClass *class; diff --git a/libavfilter/vf_colorkey_opencl.c b/libavfilter/vf_colorkey_opencl.c index d1c877521a..24c6b1f741 100644 --- a/libavfilter/vf_colorkey_opencl.c +++ b/libavfilter/vf_colorkey_opencl.c @@ -19,7 +19,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c index 728e5048f3..e33bdf6799 100644 --- a/libavfilter/vf_colorlevels.c +++ b/libavfilter/vf_colorlevels.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "preserve_color.h" diff --git a/libavfilter/vf_colormap.c b/libavfilter/vf_colormap.c index aa09d0cf67..77b7067d07 100644 --- a/libavfilter/vf_colormap.c +++ b/libavfilter/vf_colormap.c @@ -29,7 +29,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 03e4f63a25..d0e3043fd5 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -31,7 +31,6 @@ #include #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index 68c9419727..344dcd5f9e 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -35,7 +35,6 @@ #include "colorspacedsp.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "colorspace.h" diff --git a/libavfilter/vf_colorspace_cuda.c b/libavfilter/vf_colorspace_cuda.c index f089b20ed7..9d1058ff7f 100644 --- a/libavfilter/vf_colorspace_cuda.c +++ b/libavfilter/vf_colorspace_cuda.c @@ -32,7 +32,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "cuda/load_helper.h" diff --git a/libavfilter/vf_colortemperature.c b/libavfilter/vf_colortemperature.c index b7de6bb53a..3c2f347885 100644 --- a/libavfilter/vf_colortemperature.c +++ b/libavfilter/vf_colortemperature.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index 5aca907a18..aacfe0add2 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "convolution.h" #include "filters.h" -#include "internal.h" #include "video.h" #define OFFSET(x) offsetof(ConvolutionContext, x) diff --git a/libavfilter/vf_convolution_opencl.c b/libavfilter/vf_convolution_opencl.c index 82def57056..ba6f084548 100644 --- a/libavfilter/vf_convolution_opencl.c +++ b/libavfilter/vf_convolution_opencl.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index eb83794b88..1c1e0ba08f 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #define MAX_THREADS 16 diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index 54cb12c426..8158414dcf 100644 --- a/libavfilter/vf_copy.c +++ b/libavfilter/vf_copy.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" static int query_formats(AVFilterContext *ctx) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 5c77e8a554..b4a4d6c476 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "libavutil/internal.h" #include "libavutil/mem.h" diff --git a/libavfilter/vf_corr.c b/libavfilter/vf_corr.c index 928eafff96..9df1826c9b 100644 --- a/libavfilter/vf_corr.c +++ b/libavfilter/vf_corr.c @@ -29,7 +29,6 @@ #include "drawutils.h" #include "filters.h" #include "framesync.h" -#include "internal.h" typedef struct Sums { uint64_t s[2]; diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index 5351e38dbb..95df291ba5 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -25,7 +25,6 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "lavfutils.h" diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index a16fc22743..4742732b63 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -28,7 +28,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "libavutil/eval.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index 4912927e51..8b02778037 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -32,7 +32,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "edge_common.h" diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 85b493d5ad..dc399cf846 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index b4496eca2d..7b4cb52ee8 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -27,7 +27,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct DatascopeContext { diff --git a/libavfilter/vf_dblur.c b/libavfilter/vf_dblur.c index ab8bdbbad4..9ea42f2a52 100644 --- a/libavfilter/vf_dblur.c +++ b/libavfilter/vf_dblur.c @@ -24,7 +24,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct DBlurContext { diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c index 66fe154010..9d1247c8f0 100644 --- a/libavfilter/vf_dctdnoiz.c +++ b/libavfilter/vf_dctdnoiz.c @@ -35,7 +35,6 @@ #include "libavutil/opt.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { "c", NULL }; diff --git a/libavfilter/vf_deband.c b/libavfilter/vf_deband.c index 013324a766..31b864b760 100644 --- a/libavfilter/vf_deband.c +++ b/libavfilter/vf_deband.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct DebandContext { diff --git a/libavfilter/vf_deblock.c b/libavfilter/vf_deblock.c index 7b6cd04ffc..3b07856dc7 100644 --- a/libavfilter/vf_deblock.c +++ b/libavfilter/vf_deblock.c @@ -28,7 +28,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum FilterType { WEAK, STRONG, NB_FILTER }; diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c index d3b03e76f6..2e3dba5e74 100644 --- a/libavfilter/vf_decimate.c +++ b/libavfilter/vf_decimate.c @@ -24,7 +24,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #define INPUT_MAIN 0 #define INPUT_CLEANSRC 1 diff --git a/libavfilter/vf_dedot.c b/libavfilter/vf_dedot.c index acdb03c706..09fd973e5d 100644 --- a/libavfilter/vf_dedot.c +++ b/libavfilter/vf_dedot.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct DedotContext { diff --git a/libavfilter/vf_deflicker.c b/libavfilter/vf_deflicker.c index 474f00df35..da16677f6d 100644 --- a/libavfilter/vf_deflicker.c +++ b/libavfilter/vf_deflicker.c @@ -29,7 +29,6 @@ #include "bufferqueue.h" #include "filters.h" -#include "internal.h" #include "video.h" #define SIZE FF_BUFQUEUE_SIZE diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 5a64e5f33a..0478d6daef 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "vaapi_vpp.h" diff --git a/libavfilter/vf_dejudder.c b/libavfilter/vf_dejudder.c index 0a4a68bd8d..75177e22ae 100644 --- a/libavfilter/vf_dejudder.c +++ b/libavfilter/vf_dejudder.c @@ -53,7 +53,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" typedef struct DejudderContext { const AVClass *class; diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index a321b805a2..942deb1c53 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -34,7 +34,6 @@ #include "libavutil/eval.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char * const var_names[] = { "x", diff --git a/libavfilter/vf_derain.c b/libavfilter/vf_derain.c index fa5e073671..6dd179c942 100644 --- a/libavfilter/vf_derain.c +++ b/libavfilter/vf_derain.c @@ -28,7 +28,6 @@ #include "avfilter.h" #include "dnn_filter_common.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct DRContext { diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 33c460c01e..af140b86d2 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -51,7 +51,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "transform.h" #include "video.h" #include "libavutil/common.h" diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c index 47b74a8606..6f1d007a83 100644 --- a/libavfilter/vf_deshake_opencl.c +++ b/libavfilter/vf_deshake_opencl.c @@ -58,7 +58,6 @@ #include "framequeue.h" #include "filters.h" #include "transform.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_despill.c b/libavfilter/vf_despill.c index ca9b075f0c..9365114b91 100644 --- a/libavfilter/vf_despill.c +++ b/libavfilter/vf_despill.c @@ -22,7 +22,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" typedef struct DespillContext { const AVClass *class; diff --git a/libavfilter/vf_detelecine.c b/libavfilter/vf_detelecine.c index ecf1de7da1..8eae7107c2 100644 --- a/libavfilter/vf_detelecine.c +++ b/libavfilter/vf_detelecine.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct DetelecineContext { diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c index c243d422d8..6e3df139e6 100644 --- a/libavfilter/vf_displace.c +++ b/libavfilter/vf_displace.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" enum EdgeMode { diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index f6d3678796..c52e50ca96 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -26,7 +26,6 @@ #include "libavutil/opt.h" #include "filters.h" #include "dnn_filter_common.h" -#include "internal.h" #include "video.h" #include "libavutil/time.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 2a277d4169..f4abd38ec1 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -26,7 +26,6 @@ #include "libavutil/opt.h" #include "filters.h" #include "dnn_filter_common.h" -#include "internal.h" #include "video.h" #include "libavutil/time.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c index 7c0f84ec80..eb75f06f05 100644 --- a/libavfilter/vf_dnn_processing.c +++ b/libavfilter/vf_dnn_processing.c @@ -29,7 +29,6 @@ #include "libavutil/imgutils.h" #include "filters.h" #include "dnn_filter_common.h" -#include "internal.h" #include "video.h" #include "libswscale/swscale.h" #include "libavutil/time.h" diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index ac6395fc62..46dfc59ab8 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -37,7 +37,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/vf_drawbox_vaapi.c b/libavfilter/vf_drawbox_vaapi.c index c3e6e0943d..5b4f23066f 100644 --- a/libavfilter/vf_drawbox_vaapi.c +++ b/libavfilter/vf_drawbox_vaapi.c @@ -22,7 +22,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 78bda5b122..4c55a01155 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -62,7 +62,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "textutils.h" #include "video.h" diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index 72280c8ba7..32339a0d8b 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -32,7 +32,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "edge_common.h" diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 93d416a216..453147ca33 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -33,7 +33,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct ELBGFilterContext { diff --git a/libavfilter/vf_entropy.c b/libavfilter/vf_entropy.c index 4db3d2b70b..e8dd7745d5 100644 --- a/libavfilter/vf_entropy.c +++ b/libavfilter/vf_entropy.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct EntropyContext { diff --git a/libavfilter/vf_epx.c b/libavfilter/vf_epx.c index af32e21163..6e66bdda3c 100644 --- a/libavfilter/vf_epx.c +++ b/libavfilter/vf_epx.c @@ -20,7 +20,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct EPXContext { diff --git a/libavfilter/vf_eq.c b/libavfilter/vf_eq.c index 377bc848bf..f3855f66a3 100644 --- a/libavfilter/vf_eq.c +++ b/libavfilter/vf_eq.c @@ -33,7 +33,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "vf_eq.h" #include "video.h" diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index fccbec7853..477b8f8f90 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -24,7 +24,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ESTDIFContext { diff --git a/libavfilter/vf_exposure.c b/libavfilter/vf_exposure.c index 75be794d00..efdae40e00 100644 --- a/libavfilter/vf_exposure.c +++ b/libavfilter/vf_exposure.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ExposureContext { diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 8f1c9cca40..8873abf84b 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -29,7 +29,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #define PLANE_R 0x01 diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index 6db60f06f5..fb04c7ce32 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -35,7 +35,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_feedback.c b/libavfilter/vf_feedback.c index 2fb7d48057..ddc53cad27 100644 --- a/libavfilter/vf_feedback.c +++ b/libavfilter/vf_feedback.c @@ -28,7 +28,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct FeedbackContext { diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index f525cbf635..cbc49fe9a1 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -26,7 +26,6 @@ #include "libavutil/tx.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "window_func.h" diff --git a/libavfilter/vf_fftfilt.c b/libavfilter/vf_fftfilt.c index e2a8adb7b4..b60d47edcc 100644 --- a/libavfilter/vf_fftfilt.c +++ b/libavfilter/vf_fftfilt.c @@ -25,7 +25,6 @@ */ #include "filters.h" -#include "internal.h" #include "video.h" #include "libavutil/common.h" #include "libavutil/cpu.h" diff --git a/libavfilter/vf_field.c b/libavfilter/vf_field.c index 0e981fabf5..2d730b3dd5 100644 --- a/libavfilter/vf_field.c +++ b/libavfilter/vf_field.c @@ -28,7 +28,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" enum FieldType { FIELD_TYPE_TOP = 0, FIELD_TYPE_BOTTOM }; diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index 0320484d5c..92e3c5c8b9 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" enum HintModes { diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index 555ae81bc6..9198c894f9 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -40,7 +40,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #define INPUT_MAIN 0 diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 82f88f43be..46b7f4bb30 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct FieldOrderContext { diff --git a/libavfilter/vf_fillborders.c b/libavfilter/vf_fillborders.c index 1bd4e2081f..619b2cf75e 100644 --- a/libavfilter/vf_fillborders.c +++ b/libavfilter/vf_fillborders.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" enum { Y, U, V, A }; diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c index bfd6cc583c..1b11fbbb93 100644 --- a/libavfilter/vf_find_rect.c +++ b/libavfilter/vf_find_rect.c @@ -26,7 +26,6 @@ #include "libavutil/opt.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "lavfutils.h" diff --git a/libavfilter/vf_flip_vulkan.c b/libavfilter/vf_flip_vulkan.c index bad617d024..1271396803 100644 --- a/libavfilter/vf_flip_vulkan.c +++ b/libavfilter/vf_flip_vulkan.c @@ -25,7 +25,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "video.h" enum FlipType { diff --git a/libavfilter/vf_floodfill.c b/libavfilter/vf_floodfill.c index 3f94af0fc4..0d4c86173a 100644 --- a/libavfilter/vf_floodfill.c +++ b/libavfilter/vf_floodfill.c @@ -24,7 +24,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct Points { diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 83deff7190..da39625fec 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -35,7 +35,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct FormatContext { diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index c422c5e9a6..3eb43c0b26 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -36,7 +36,6 @@ #include "avfilter.h" #include "ccfifo.h" #include "filters.h" -#include "internal.h" #include "video.h" enum EOFAction { diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c index d3a195c024..daab49cfff 100644 --- a/libavfilter/vf_framepack.c +++ b/libavfilter/vf_framepack.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define LEFT 0 diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index f525ab1b65..9e7cac660f 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -35,7 +35,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" -#include "internal.h" #include "video.h" #include "filters.h" #include "framerate.h" diff --git a/libavfilter/vf_framestep.c b/libavfilter/vf_framestep.c index 115ac45fe4..98cbf05405 100644 --- a/libavfilter/vf_framestep.c +++ b/libavfilter/vf_framestep.c @@ -26,7 +26,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct NullContext { diff --git a/libavfilter/vf_freezeframes.c b/libavfilter/vf_freezeframes.c index fffe86a2df..ff8112ce1e 100644 --- a/libavfilter/vf_freezeframes.c +++ b/libavfilter/vf_freezeframes.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct FreezeFramesContext { diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index eeaf7ad2b4..83ca9c98b1 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -41,7 +41,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef f0r_instance_t (*f0r_construct_f)(unsigned int width, unsigned int height); diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index d1945d26ff..c35217e9f1 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -43,7 +43,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "qp_table.h" #include "vf_fspp.h" #include "video.h" diff --git a/libavfilter/vf_gblur.c b/libavfilter/vf_gblur.c index 07e151a0b1..a994ee5dd3 100644 --- a/libavfilter/vf_gblur.c +++ b/libavfilter/vf_gblur.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "filters.h" #include "gblur.h" -#include "internal.h" #include "vf_gblur_init.h" #include "video.h" diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c index 27cac920ec..546e2828b0 100644 --- a/libavfilter/vf_gblur_vulkan.c +++ b/libavfilter/vf_gblur_vulkan.c @@ -26,7 +26,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "video.h" #define CGS 32 diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index b23c3e170c..bb95f45e2e 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -35,7 +35,6 @@ #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #define MAX_NB_THREADS 32 diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index 5a70467a7e..6b52e09f23 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -42,7 +42,6 @@ #include "avfilter.h" #include "filters.h" #include "gradfun.h" -#include "internal.h" #include "video.h" DECLARE_ALIGNED(16, static const uint16_t, dither)[8][8] = { diff --git a/libavfilter/vf_grayworld.c b/libavfilter/vf_grayworld.c index 60ee444887..a6a51dcb7d 100644 --- a/libavfilter/vf_grayworld.c +++ b/libavfilter/vf_grayworld.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ThreadData { diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index 262d1df996..f0d9d8f9d3 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" enum FilterModes { diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 769df9e3c0..47870a167d 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -30,7 +30,6 @@ #include "filters.h" #include "formats.h" #include "hflip.h" -#include "internal.h" #include "vf_hflip_init.h" #include "video.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c index e714cf2ad2..6af96b6353 100644 --- a/libavfilter/vf_histeq.c +++ b/libavfilter/vf_histeq.c @@ -35,7 +35,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" // #define DEBUG diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 697ae21ed3..73fd78caf8 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct HistogramContext { diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 0aaa37dfe4..3ba1c539ac 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -39,7 +39,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "vf_hqdn3d.h" diff --git a/libavfilter/vf_hqx.c b/libavfilter/vf_hqx.c index 932313cac1..20a78f2dcf 100644 --- a/libavfilter/vf_hqx.c +++ b/libavfilter/vf_hqx.c @@ -31,7 +31,6 @@ #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "filters.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_hsvkey.c b/libavfilter/vf_hsvkey.c index f0954e0460..c5badd82c0 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -25,7 +25,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" typedef struct HSVKeyContext { const AVClass *class; diff --git a/libavfilter/vf_hue.c b/libavfilter/vf_hue.c index 42f774772e..56899a9775 100644 --- a/libavfilter/vf_hue.c +++ b/libavfilter/vf_hue.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define SAT_MIN_VAL -10 diff --git a/libavfilter/vf_huesaturation.c b/libavfilter/vf_huesaturation.c index e5891f8b17..af58b114b7 100644 --- a/libavfilter/vf_huesaturation.c +++ b/libavfilter/vf_huesaturation.c @@ -21,7 +21,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_hwdownload.c b/libavfilter/vf_hwdownload.c index 75c4b215be..0b70727b29 100644 --- a/libavfilter/vf_hwdownload.c +++ b/libavfilter/vf_hwdownload.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct HWDownloadContext { diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index d3e84e39d7..e999605eb1 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct HWMapContext { diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c index 9c11e72759..3afd67012f 100644 --- a/libavfilter/vf_hwupload.c +++ b/libavfilter/vf_hwupload.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct HWUploadContext { diff --git a/libavfilter/vf_hwupload_cuda.c b/libavfilter/vf_hwupload_cuda.c index fa96f06de1..1d04045551 100644 --- a/libavfilter/vf_hwupload_cuda.c +++ b/libavfilter/vf_hwupload_cuda.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct CudaUploadContext { diff --git a/libavfilter/vf_hysteresis.c b/libavfilter/vf_hysteresis.c index 70df8b4375..d2b85764f5 100644 --- a/libavfilter/vf_hysteresis.c +++ b/libavfilter/vf_hysteresis.c @@ -25,7 +25,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_iccdetect.c b/libavfilter/vf_iccdetect.c index 18a7e2ba9c..044a92ee0f 100644 --- a/libavfilter/vf_iccdetect.c +++ b/libavfilter/vf_iccdetect.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "fflcms2.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct IccDetectContext { diff --git a/libavfilter/vf_iccgen.c b/libavfilter/vf_iccgen.c index 8ae1d84161..35c571d31c 100644 --- a/libavfilter/vf_iccgen.c +++ b/libavfilter/vf_iccgen.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "fflcms2.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct IccGenContext { diff --git a/libavfilter/vf_identity.c b/libavfilter/vf_identity.c index 2446658bb9..d06e9f3d68 100644 --- a/libavfilter/vf_identity.c +++ b/libavfilter/vf_identity.c @@ -33,7 +33,6 @@ #include "drawutils.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "scene_sad.h" typedef struct IdentityContext { diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 197e33f2d2..c57e7ccb20 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -22,7 +22,6 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "internal.h" #include "filters.h" #include "vf_idet.h" diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c index ac79990964..9a3a9d47a9 100644 --- a/libavfilter/vf_il.c +++ b/libavfilter/vf_il.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" enum FilterMode { diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c index 61fa53a5d5..6114a58a5b 100644 --- a/libavfilter/vf_kerndeint.c +++ b/libavfilter/vf_kerndeint.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct KerndeintContext { diff --git a/libavfilter/vf_lagfun.c b/libavfilter/vf_lagfun.c index 9d781b9f7f..b3020c28a9 100644 --- a/libavfilter/vf_lagfun.c +++ b/libavfilter/vf_lagfun.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct LagfunContext { diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index c9d4818b06..db80cdb4eb 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct LenscorrectionCtx { diff --git a/libavfilter/vf_lensfun.c b/libavfilter/vf_lensfun.c index 22016a7e8a..7c428e3ca7 100644 --- a/libavfilter/vf_lensfun.c +++ b/libavfilter/vf_lensfun.c @@ -32,7 +32,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index 237af6e227..0250a54835 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -39,7 +39,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" static void fill_iplimage_from_frame(IplImage *img, const AVFrame *frame, enum AVPixelFormat pixfmt) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 268bba8e38..2176a7188c 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -24,7 +24,6 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "formats.h" -#include "internal.h" #include "filters.h" #include "video.h" #include "vulkan_filter.h" diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index b06f09e834..f655092b20 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -37,7 +37,6 @@ #include "filters.h" #include "formats.h" #include "framesync.h" -#include "internal.h" #include "video.h" #if CONFIG_LIBVMAF_CUDA_FILTER diff --git a/libavfilter/vf_limitdiff.c b/libavfilter/vf_limitdiff.c index b30b3bc93b..a54942ad52 100644 --- a/libavfilter/vf_limitdiff.c +++ b/libavfilter/vf_limitdiff.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_limiter.c b/libavfilter/vf_limiter.c index 0df104156e..6826b4c308 100644 --- a/libavfilter/vf_limiter.c +++ b/libavfilter/vf_limiter.c @@ -23,7 +23,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "limiter.h" #include "video.h" diff --git a/libavfilter/vf_lumakey.c b/libavfilter/vf_lumakey.c index ee243dda48..773fe5df61 100644 --- a/libavfilter/vf_lumakey.c +++ b/libavfilter/vf_lumakey.c @@ -22,7 +22,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct LumakeyContext { diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 7e0abdebc6..7e7fd2fa4a 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -37,7 +37,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c index e1bcadb101..2488c9fdc2 100644 --- a/libavfilter/vf_lut2.c +++ b/libavfilter/vf_lut2.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 9f10502e28..46955b99a5 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -36,7 +36,6 @@ #include "libavutil/avstring.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "lut3d.h" diff --git a/libavfilter/vf_maskedclamp.c b/libavfilter/vf_maskedclamp.c index 787d7493fd..2e9778fe24 100644 --- a/libavfilter/vf_maskedclamp.c +++ b/libavfilter/vf_maskedclamp.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" #include "maskedclamp.h" diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index aa5aebb0f8..a6dfb2d830 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "maskedmerge.h" diff --git a/libavfilter/vf_maskedminmax.c b/libavfilter/vf_maskedminmax.c index dd439f5424..b9582d1539 100644 --- a/libavfilter/vf_maskedminmax.c +++ b/libavfilter/vf_maskedminmax.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_maskedthreshold.c b/libavfilter/vf_maskedthreshold.c index a79063b980..5d2038564d 100644 --- a/libavfilter/vf_maskedthreshold.c +++ b/libavfilter/vf_maskedthreshold.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_maskfun.c b/libavfilter/vf_maskfun.c index 53c3b91824..cd74d2669c 100644 --- a/libavfilter/vf_maskfun.c +++ b/libavfilter/vf_maskfun.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct MaskFunContext { diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 713df31308..05c9105f7d 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -53,7 +53,6 @@ #include "libavcodec/avcodec.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum MCDeintMode { diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c index c4e3ca400d..a5c51621d2 100644 --- a/libavfilter/vf_median.c +++ b/libavfilter/vf_median.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "median.h" #include "video.h" diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index e74c12407f..8c1537e0bc 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_mestimate.c b/libavfilter/vf_mestimate.c index 842932c17b..8662b5f660 100644 --- a/libavfilter/vf_mestimate.c +++ b/libavfilter/vf_mestimate.c @@ -26,7 +26,6 @@ #include "libavutil/motion_vector.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct MEContext { diff --git a/libavfilter/vf_midequalizer.c b/libavfilter/vf_midequalizer.c index 89917847b8..9afbeb6f11 100644 --- a/libavfilter/vf_midequalizer.c +++ b/libavfilter/vf_midequalizer.c @@ -24,7 +24,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index f39e514100..39a3f55f41 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -27,7 +27,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "scene_sad.h" diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index a007d6aac3..3717a21930 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -22,7 +22,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 13a0dc43f6..16d6bf328c 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_monochrome.c b/libavfilter/vf_monochrome.c index 46287781b9..b8242c045f 100644 --- a/libavfilter/vf_monochrome.c +++ b/libavfilter/vf_monochrome.c @@ -24,7 +24,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct MonochromeContext { diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index bd1723b906..02e731cc46 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -32,7 +32,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" enum MorphModes { diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index c9670f2429..e101565f6d 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -30,7 +30,6 @@ #include "libavutil/timestamp.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct DecimateContext { diff --git a/libavfilter/vf_multiply.c b/libavfilter/vf_multiply.c index 9ebcb85b6b..fd8ab1092b 100644 --- a/libavfilter/vf_multiply.c +++ b/libavfilter/vf_multiply.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "framesync.h" diff --git a/libavfilter/vf_negate.c b/libavfilter/vf_negate.c index b6b5299799..f857415ee8 100644 --- a/libavfilter/vf_negate.c +++ b/libavfilter/vf_negate.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define COMP_R 0x01 diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index d1e5b179b2..29772ccb11 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -27,7 +27,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ThreadData { diff --git a/libavfilter/vf_neighbor_opencl.c b/libavfilter/vf_neighbor_opencl.c index 9d6d1e9e66..d8238a138e 100644 --- a/libavfilter/vf_neighbor_opencl.c +++ b/libavfilter/vf_neighbor_opencl.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 968311d03d..86bf5b8e0a 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -35,7 +35,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "vf_nlmeans.h" #include "vf_nlmeans_init.h" #include "video.h" diff --git a/libavfilter/vf_nlmeans_opencl.c b/libavfilter/vf_nlmeans_opencl.c index e5316d04f1..b224280088 100644 --- a/libavfilter/vf_nlmeans_opencl.c +++ b/libavfilter/vf_nlmeans_opencl.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_nlmeans_vulkan.c b/libavfilter/vf_nlmeans_vulkan.c index 96d51548a2..cd44f5e4db 100644 --- a/libavfilter/vf_nlmeans_vulkan.c +++ b/libavfilter/vf_nlmeans_vulkan.c @@ -25,7 +25,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "video.h" #define TYPE_NAME "vec4" diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 4b8b11a722..1b1f9e8b42 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -31,7 +31,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const size_t NNEDI_WEIGHTS_SIZE = 13574928; diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index 1d9646cb32..b5ef416dec 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "vf_noise.h" #include "video.h" diff --git a/libavfilter/vf_normalize.c b/libavfilter/vf_normalize.c index c713946f9c..613edd532f 100644 --- a/libavfilter/vf_normalize.c +++ b/libavfilter/vf_normalize.c @@ -79,7 +79,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct NormalizeHistory { diff --git a/libavfilter/vf_null.c b/libavfilter/vf_null.c index af06a340d7..372503a084 100644 --- a/libavfilter/vf_null.c +++ b/libavfilter/vf_null.c @@ -24,7 +24,6 @@ #include "libavutil/internal.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" const AVFilter ff_vf_null = { diff --git a/libavfilter/vf_ocr.c b/libavfilter/vf_ocr.c index f88a1a6e35..f0b4b24288 100644 --- a/libavfilter/vf_ocr.c +++ b/libavfilter/vf_ocr.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct OCRContext { diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index d8ac36495d..03b48bf681 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -35,7 +35,6 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/timestamp.h" -#include "internal.h" #include "filters.h" #include "drawutils.h" #include "framesync.h" diff --git a/libavfilter/vf_overlay_cuda.c b/libavfilter/vf_overlay_cuda.c index 5bc1e275fa..a35f6eda6e 100644 --- a/libavfilter/vf_overlay_cuda.c +++ b/libavfilter/vf_overlay_cuda.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "cuda/load_helper.h" diff --git a/libavfilter/vf_overlay_opencl.c b/libavfilter/vf_overlay_opencl.c index 219d4fef37..c8c9d8bf1d 100644 --- a/libavfilter/vf_overlay_opencl.c +++ b/libavfilter/vf_overlay_opencl.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 37a0d4c2c8..39bc700637 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -30,7 +30,6 @@ #include "libavutil/mathematics.h" #include "filters.h" -#include "internal.h" #include "avfilter.h" #include "formats.h" diff --git a/libavfilter/vf_overlay_vaapi.c b/libavfilter/vf_overlay_vaapi.c index 16477ad24b..dde7f00a67 100644 --- a/libavfilter/vf_overlay_vaapi.c +++ b/libavfilter/vf_overlay_vaapi.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "vaapi_vpp.h" #include "video.h" #include "libavutil/eval.h" diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index 233c5a68d6..09444067af 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -24,7 +24,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_owdenoise.c b/libavfilter/vf_owdenoise.c index 4df8f972a8..624e2d8cf1 100644 --- a/libavfilter/vf_owdenoise.c +++ b/libavfilter/vf_owdenoise.c @@ -40,7 +40,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct OWDenoiseContext { diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 584bcc9847..e0cf84002b 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "libavutil/avstring.h" #include "libavutil/common.h" diff --git a/libavfilter/vf_pad_opencl.c b/libavfilter/vf_pad_opencl.c index a30236d5dd..d5447a9978 100644 --- a/libavfilter/vf_pad_opencl.c +++ b/libavfilter/vf_pad_opencl.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_pad_vaapi.c b/libavfilter/vf_pad_vaapi.c index 7b4e45bc1b..f45e503141 100644 --- a/libavfilter/vf_pad_vaapi.c +++ b/libavfilter/vf_pad_vaapi.c @@ -22,7 +22,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index d29f4b8e2a..666bb6e349 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -32,7 +32,6 @@ #include "avfilter.h" #include "filters.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 cb251fa5f9..0cd00d520e 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -34,7 +34,6 @@ #include "filters.h" #include "formats.h" #include "framesync.h" -#include "internal.h" #include "palette.h" #include "video.h" diff --git a/libavfilter/vf_perspective.c b/libavfilter/vf_perspective.c index fedf8a03f1..5dd56a7dff 100644 --- a/libavfilter/vf_perspective.c +++ b/libavfilter/vf_perspective.c @@ -27,7 +27,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define SUB_PIXEL_BITS 8 diff --git a/libavfilter/vf_phase.c b/libavfilter/vf_phase.c index a66ed33e3a..6cd8d8bb9d 100644 --- a/libavfilter/vf_phase.c +++ b/libavfilter/vf_phase.c @@ -24,7 +24,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum PhaseMode { diff --git a/libavfilter/vf_photosensitivity.c b/libavfilter/vf_photosensitivity.c index e7920b3242..5ea987379a 100644 --- a/libavfilter/vf_photosensitivity.c +++ b/libavfilter/vf_photosensitivity.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define MAX_FRAMES 240 diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index c2e9014968..f53f087f21 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -28,7 +28,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct PixdescTestContext { diff --git a/libavfilter/vf_pixelize.c b/libavfilter/vf_pixelize.c index 59c0a659b0..bf92818633 100644 --- a/libavfilter/vf_pixelize.c +++ b/libavfilter/vf_pixelize.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum PixelizeModes { diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c index 366a35fcf2..85ac795583 100644 --- a/libavfilter/vf_pp.c +++ b/libavfilter/vf_pp.c @@ -29,7 +29,6 @@ #include "libavutil/opt.h" #include "filters.h" -#include "internal.h" #include "qp_table.h" #include "video.h" diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index d3baa69d50..6fe243bbaa 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -35,7 +35,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "qp_table.h" #include "vf_pp7.h" #include "video.h" diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index c9fabf7ae7..30be869919 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -27,7 +27,6 @@ #include "filters.h" #include "formats.h" #include "framesync.h" -#include "internal.h" #include "video.h" typedef struct ThreadData { diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index 7550040945..be3cdae8bb 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -22,7 +22,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index eddf13ea27..3b49829161 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "opencl.h" #include "video.h" diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 2fa26e6b14..46c65da383 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index b1488effde..1f02811806 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -34,7 +34,6 @@ #include "drawutils.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "psnr.h" typedef struct PSNRContext { diff --git a/libavfilter/vf_pullup.c b/libavfilter/vf_pullup.c index 128ebb71d6..9c8ac7f914 100644 --- a/libavfilter/vf_pullup.c +++ b/libavfilter/vf_pullup.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "vf_pullup.h" diff --git a/libavfilter/vf_qp.c b/libavfilter/vf_qp.c index 86dd7eae29..bc881ca6dd 100644 --- a/libavfilter/vf_qp.c +++ b/libavfilter/vf_qp.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct QPContext { diff --git a/libavfilter/vf_random.c b/libavfilter/vf_random.c index 1b433be08b..032153a05f 100644 --- a/libavfilter/vf_random.c +++ b/libavfilter/vf_random.c @@ -23,7 +23,6 @@ #include "libavutil/random_seed.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #define MAX_FRAMES 512 diff --git a/libavfilter/vf_readeia608.c b/libavfilter/vf_readeia608.c index f663c88a05..84ed2a27ef 100644 --- a/libavfilter/vf_readeia608.c +++ b/libavfilter/vf_readeia608.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define LAG 25 diff --git a/libavfilter/vf_readvitc.c b/libavfilter/vf_readvitc.c index 1847152249..303703894a 100644 --- a/libavfilter/vf_readvitc.c +++ b/libavfilter/vf_readvitc.c @@ -30,7 +30,6 @@ #include "libavutil/timecode.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define LINE_DATA_SIZE 9 diff --git a/libavfilter/vf_remap.c b/libavfilter/vf_remap.c index 1b23a3ac86..df81c247eb 100644 --- a/libavfilter/vf_remap.c +++ b/libavfilter/vf_remap.c @@ -45,7 +45,6 @@ #include "filters.h" #include "formats.h" #include "framesync.h" -#include "internal.h" #include "video.h" typedef struct RemapContext { diff --git a/libavfilter/vf_remap_opencl.c b/libavfilter/vf_remap_opencl.c index 852c88d44c..89d3efd53b 100644 --- a/libavfilter/vf_remap_opencl.c +++ b/libavfilter/vf_remap_opencl.c @@ -25,7 +25,6 @@ #include "drawutils.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_removegrain.c b/libavfilter/vf_removegrain.c index a07857893d..5a02670235 100644 --- a/libavfilter/vf_removegrain.c +++ b/libavfilter/vf_removegrain.c @@ -27,7 +27,6 @@ #include "libavutil/qsort.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "removegrain.h" #include "video.h" diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index 43f1948076..f17487eac8 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -74,7 +74,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "bbox.h" #include "lavfutils.h" diff --git a/libavfilter/vf_repeatfields.c b/libavfilter/vf_repeatfields.c index 612c2f9049..a89a295cca 100644 --- a/libavfilter/vf_repeatfields.c +++ b/libavfilter/vf_repeatfields.c @@ -21,7 +21,6 @@ #include "libavutil/imgutils.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct RepeatFieldsContext { diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c index 2c598921d1..0a41946480 100644 --- a/libavfilter/vf_rotate.c +++ b/libavfilter/vf_rotate.c @@ -34,7 +34,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #include diff --git a/libavfilter/vf_sab.c b/libavfilter/vf_sab.c index 2bd2bfd73a..d6fcb73a08 100644 --- a/libavfilter/vf_sab.c +++ b/libavfilter/vf_sab.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct FilterParam { diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 454fb812e4..9d50848138 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -31,7 +31,6 @@ #include "filters.h" #include "formats.h" #include "framesync.h" -#include "internal.h" #include "scale_eval.h" #include "video.h" #include "libavutil/eval.h" diff --git a/libavfilter/vf_scale_cuda.c b/libavfilter/vf_scale_cuda.c index 83073f8b4b..54a340949d 100644 --- a/libavfilter/vf_scale_cuda.c +++ b/libavfilter/vf_scale_cuda.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "scale_eval.h" #include "video.h" diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index d229083e8a..0c38987687 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -38,7 +38,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "scale_eval.h" #include "video.h" diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 27ec0e6e26..41f119bb55 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "scale_eval.h" #include "video.h" #include "vaapi_vpp.h" diff --git a/libavfilter/vf_scale_vt.c b/libavfilter/vf_scale_vt.c index 7481af1747..527e3ca72a 100644 --- a/libavfilter/vf_scale_vt.c +++ b/libavfilter/vf_scale_vt.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "scale_eval.h" #include "video.h" diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c index d53789e6c5..6a32ebbd5e 100644 --- a/libavfilter/vf_scale_vulkan.c +++ b/libavfilter/vf_scale_vulkan.c @@ -24,7 +24,6 @@ #include "vulkan_spirv.h" #include "scale_eval.h" #include "filters.h" -#include "internal.h" #include "colorspace.h" #include "video.h" diff --git a/libavfilter/vf_scroll.c b/libavfilter/vf_scroll.c index 229c28876d..c5646264f0 100644 --- a/libavfilter/vf_scroll.c +++ b/libavfilter/vf_scroll.c @@ -23,7 +23,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ScrollContext { diff --git a/libavfilter/vf_selectivecolor.c b/libavfilter/vf_selectivecolor.c index b0e98bfb87..fce9f67ac4 100644 --- a/libavfilter/vf_selectivecolor.c +++ b/libavfilter/vf_selectivecolor.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_separatefields.c b/libavfilter/vf_separatefields.c index 91df45980f..54c112bf60 100644 --- a/libavfilter/vf_separatefields.c +++ b/libavfilter/vf_separatefields.c @@ -21,7 +21,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct SeparateFieldsContext { diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c index ecca2c2360..07845f7550 100644 --- a/libavfilter/vf_setparams.c +++ b/libavfilter/vf_setparams.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" enum SetFieldMode { diff --git a/libavfilter/vf_sharpen_npp.c b/libavfilter/vf_sharpen_npp.c index 437cfb23cc..4989126eda 100644 --- a/libavfilter/vf_sharpen_npp.c +++ b/libavfilter/vf_sharpen_npp.c @@ -25,7 +25,6 @@ #include #include "filters.h" -#include "internal.h" #include "libavutil/pixdesc.h" #include "libavutil/cuda_check.h" #include "libavutil/hwcontext.h" diff --git a/libavfilter/vf_shear.c b/libavfilter/vf_shear.c index 1598d5b283..067d38286b 100644 --- a/libavfilter/vf_shear.c +++ b/libavfilter/vf_shear.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #include diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 6118e1a19a..f81df9d1bf 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -48,7 +48,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ShowInfoContext { diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c index 5e3aa08672..e887d07092 100644 --- a/libavfilter/vf_showpalette.c +++ b/libavfilter/vf_showpalette.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct ShowPaletteContext { diff --git a/libavfilter/vf_shuffleframes.c b/libavfilter/vf_shuffleframes.c index 3d677f64e2..77ce6d9759 100644 --- a/libavfilter/vf_shuffleframes.c +++ b/libavfilter/vf_shuffleframes.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ShuffleFramesContext { diff --git a/libavfilter/vf_shufflepixels.c b/libavfilter/vf_shufflepixels.c index fcc5b14204..875601a987 100644 --- a/libavfilter/vf_shufflepixels.c +++ b/libavfilter/vf_shufflepixels.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct ShufflePixelsContext { diff --git a/libavfilter/vf_shuffleplanes.c b/libavfilter/vf_shuffleplanes.c index 8b1791f078..c9cbd472ef 100644 --- a/libavfilter/vf_shuffleplanes.c +++ b/libavfilter/vf_shuffleplanes.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct ShufflePlanesContext { diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 78a23bb705..8dca3cb444 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -25,7 +25,6 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" enum FilterMode { FILTER_NONE = -1, diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index d5df683642..f205f6919f 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -32,7 +32,6 @@ #include "libavutil/file_open.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "signature.h" #include "signature_lookup.c" diff --git a/libavfilter/vf_siti.c b/libavfilter/vf_siti.c index ca69211f60..3c563ac8b7 100644 --- a/libavfilter/vf_siti.c +++ b/libavfilter/vf_siti.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const int X_FILTER[9] = { diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index 5d1a13df52..fe1b591a40 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define RADIUS_MIN 0.1 diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 02f53af6ea..0c33c263b8 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -39,7 +39,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "qp_table.h" #include "vf_spp.h" #include "video.h" diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index 4b08a632ce..6c33203307 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 609d082ef7..97bffcf70c 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -43,7 +43,6 @@ #include "drawutils.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "ssim.h" typedef struct SSIMContext { diff --git a/libavfilter/vf_ssim360.c b/libavfilter/vf_ssim360.c index ca0545e178..57da2f3938 100644 --- a/libavfilter/vf_ssim360.c +++ b/libavfilter/vf_ssim360.c @@ -52,7 +52,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "framesync.h" #define RIGHT 0 diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 4d42d9b5c5..8328048649 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -31,7 +31,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_stack_qsv.c b/libavfilter/vf_stack_qsv.c index a23e4f3e7e..9c4ca4abd2 100644 --- a/libavfilter/vf_stack_qsv.c +++ b/libavfilter/vf_stack_qsv.c @@ -35,7 +35,6 @@ #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" -#include "internal.h" #include "filters.h" #include "formats.h" #include "video.h" diff --git a/libavfilter/vf_stack_vaapi.c b/libavfilter/vf_stack_vaapi.c index 612ef97efe..602a7825a3 100644 --- a/libavfilter/vf_stack_vaapi.c +++ b/libavfilter/vf_stack_vaapi.c @@ -35,7 +35,6 @@ #include "libavutil/parseutils.h" #include "libavutil/mem.h" -#include "internal.h" #include "filters.h" #include "formats.h" #include "video.h" diff --git a/libavfilter/vf_stereo3d.c b/libavfilter/vf_stereo3d.c index 67c34bccb0..dc9cc33556 100644 --- a/libavfilter/vf_stereo3d.c +++ b/libavfilter/vf_stereo3d.c @@ -29,7 +29,6 @@ #include "drawutils.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "stereo3d.h" diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 8a632c11a5..de1cfa7d9e 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -42,7 +42,6 @@ #include "filters.h" #include "drawutils.h" #include "avfilter.h" -#include "internal.h" #include "formats.h" #include "video.h" diff --git a/libavfilter/vf_super2xsai.c b/libavfilter/vf_super2xsai.c index fb46d18da5..8f3fd84788 100644 --- a/libavfilter/vf_super2xsai.c +++ b/libavfilter/vf_super2xsai.c @@ -30,7 +30,6 @@ #include "libavutil/intreadwrite.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct Super2xSaIContext { diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index e94e23b02b..71869cf53a 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct SwapRectContext { diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index dacd2f6f46..5c7c69494e 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" static void do_swap(AVFrame *frame) diff --git a/libavfilter/vf_telecine.c b/libavfilter/vf_telecine.c index 652535142e..77f62f3e8c 100644 --- a/libavfilter/vf_telecine.c +++ b/libavfilter/vf_telecine.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct TelecineContext { diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c index 2ec35eed51..b8e794f0b0 100644 --- a/libavfilter/vf_threshold.c +++ b/libavfilter/vf_threshold.c @@ -30,7 +30,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" #include "threshold.h" #include "vf_threshold_init.h" diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c index dab6ddecab..6cf791b654 100644 --- a/libavfilter/vf_thumbnail.c +++ b/libavfilter/vf_thumbnail.c @@ -32,7 +32,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #define HIST_SIZE (3*256) diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index be27d85dc7..d70df03f1e 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "cuda/load_helper.h" diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index ca382f748d..2af97fee75 100644 --- a/libavfilter/vf_tile.c +++ b/libavfilter/vf_tile.c @@ -31,7 +31,6 @@ #include "filters.h" #include "formats.h" #include "video.h" -#include "internal.h" typedef struct TileContext { const AVClass *class; diff --git a/libavfilter/vf_tiltandshift.c b/libavfilter/vf_tiltandshift.c index 25544d3e70..72475bbaab 100644 --- a/libavfilter/vf_tiltandshift.c +++ b/libavfilter/vf_tiltandshift.c @@ -32,7 +32,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" enum PaddingOption { diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index e864a84213..3e2111d9aa 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -32,7 +32,6 @@ #include "libavutil/avassert.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "tinterlace.h" #include "video.h" diff --git a/libavfilter/vf_tmidequalizer.c b/libavfilter/vf_tmidequalizer.c index 557df5c1c5..f17b2090cd 100644 --- a/libavfilter/vf_tmidequalizer.c +++ b/libavfilter/vf_tmidequalizer.c @@ -24,7 +24,6 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct TMidEqualizerContext { diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index afc966683d..d8322f45b9 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -36,7 +36,6 @@ #include "avfilter.h" #include "colorspace.h" #include "filters.h" -#include "internal.h" #include "video.h" enum TonemapAlgorithm { diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index 935f8dcdaa..2f2eeac333 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index ca9b9975aa..b1cc03709a 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c index 2df99e75f0..0b156772c8 100644 --- a/libavfilter/vf_tpad.c +++ b/libavfilter/vf_tpad.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "audio.h" #include "filters.h" -#include "internal.h" #include "formats.h" #include "drawutils.h" #include "video.h" diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 4f23c5cbae..d2836246b5 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -37,7 +37,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "transpose.h" diff --git a/libavfilter/vf_transpose_npp.c b/libavfilter/vf_transpose_npp.c index 2e3a0296f5..1706267b16 100644 --- a/libavfilter/vf_transpose_npp.c +++ b/libavfilter/vf_transpose_npp.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, device_hwctx->internal->cuda_dl, x) diff --git a/libavfilter/vf_transpose_opencl.c b/libavfilter/vf_transpose_opencl.c index aef880a9a4..063c5b3cf5 100644 --- a/libavfilter/vf_transpose_opencl.c +++ b/libavfilter/vf_transpose_opencl.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c index bc8fc3c284..4976958be1 100644 --- a/libavfilter/vf_transpose_vaapi.c +++ b/libavfilter/vf_transpose_vaapi.c @@ -22,7 +22,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "transpose.h" #include "vaapi_vpp.h" #include "video.h" diff --git a/libavfilter/vf_transpose_vt.c b/libavfilter/vf_transpose_vt.c index 72bab3d53b..86024c4ad3 100644 --- a/libavfilter/vf_transpose_vt.c +++ b/libavfilter/vf_transpose_vt.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "transpose.h" #include "video.h" diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index a955b099a1..72ea142e52 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -25,7 +25,6 @@ #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "transpose.h" #include "video.h" diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 3548b850a5..1bfb837ab1 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -38,7 +38,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" diff --git a/libavfilter/vf_unsharp_opencl.c b/libavfilter/vf_unsharp_opencl.c index 2a9f61dc18..c36997f69c 100644 --- a/libavfilter/vf_unsharp_opencl.c +++ b/libavfilter/vf_unsharp_opencl.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index 1d06b57bd8..f8e506aa27 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -37,7 +37,6 @@ #include "libavcodec/avcodec.h" #include "filters.h" -#include "internal.h" #include "qp_table.h" #include "avfilter.h" #include "video.h" diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 28a09a0857..12e40205ba 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -42,7 +42,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "v360.h" diff --git a/libavfilter/vf_vaguedenoiser.c b/libavfilter/vf_vaguedenoiser.c index 1c6f65c2e1..9321356853 100644 --- a/libavfilter/vf_vaguedenoiser.c +++ b/libavfilter/vf_vaguedenoiser.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct VagueDenoiserContext { diff --git a/libavfilter/vf_varblur.c b/libavfilter/vf_varblur.c index 5f0126fccf..8c5aebdcf0 100644 --- a/libavfilter/vf_varblur.c +++ b/libavfilter/vf_varblur.c @@ -25,7 +25,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #include "video.h" typedef struct VarBlurContext { diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index 2d6da65f26..efaf7d9279 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -27,7 +27,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" enum GraticuleType { diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index 7dfd94e5fe..1b7e1e4d7d 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -27,7 +27,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct FlipContext { diff --git a/libavfilter/vf_vfrdet.c b/libavfilter/vf_vfrdet.c index a96ebd3b81..049e87b3e1 100644 --- a/libavfilter/vf_vfrdet.c +++ b/libavfilter/vf_vfrdet.c @@ -22,7 +22,6 @@ #include "libavutil/opt.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct VFRDETContext { diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c index d60e50b7d9..3be620e696 100644 --- a/libavfilter/vf_vibrance.c +++ b/libavfilter/vf_vibrance.c @@ -23,7 +23,6 @@ #include "avfilter.h" #include "drawutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #define R 0 diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 1e1946a45d..7b52f36dd6 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -28,7 +28,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "vidstabutils.h" diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index e54a99d1b3..d2b771591e 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -28,7 +28,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "vidstabutils.h" diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c index 3def065e84..ee62723ae0 100644 --- a/libavfilter/vf_vif.c +++ b/libavfilter/vf_vif.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "filters.h" #include "framesync.h" -#include "internal.h" #define NUM_DATA_BUFS 13 diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index cfce54264d..5b4b9c7389 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -26,7 +26,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" static const char *const var_names[] = { diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 3c9813a0ca..7bc73416e8 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -31,7 +31,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "vmaf_motion.h" diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 7de3b6dda3..7f05f1fab0 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -34,7 +34,6 @@ #include "libavutil/mastering_display_metadata.h" #include "formats.h" -#include "internal.h" #include "avfilter.h" #include "filters.h" diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index bbb4ea3c47..33ebc4d6c6 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -28,7 +28,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "w3fdif.h" diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index 8be5963186..8b54e12e3d 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct ThreadData { diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c index c545e43d6d..598779d1cf 100644 --- a/libavfilter/vf_weave.c +++ b/libavfilter/vf_weave.c @@ -24,7 +24,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct WeaveContext { diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 05e621b1c3..47d11be44a 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -32,7 +32,6 @@ #include "libavutil/pixdesc.h" #include "filters.h" -#include "internal.h" #include "video.h" #define LB_MASK 0x00FEFEFE diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index 0c60c6830e..639904cabc 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -23,7 +23,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" #include "avfilter.h" -#include "internal.h" #include "filters.h" #include "video.h" diff --git a/libavfilter/vf_xfade_opencl.c b/libavfilter/vf_xfade_opencl.c index 2b659d538d..856a300c38 100644 --- a/libavfilter/vf_xfade_opencl.c +++ b/libavfilter/vf_xfade_opencl.c @@ -22,7 +22,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "opencl.h" #include "opencl_source.h" #include "video.h" diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index 2076f3e7a4..94acc5258f 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -22,7 +22,6 @@ #include "vulkan_filter.h" #include "vulkan_spirv.h" #include "filters.h" -#include "internal.h" #include "video.h" #define IN_A 0 diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index e86920cb1a..492fd0fe5e 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -28,7 +28,6 @@ #include "libavutil/qsort.h" #include "avfilter.h" -#include "internal.h" #include "filters.h" #include "framesync.h" #include "video.h" diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 3b76362c27..2bf58aa487 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -23,7 +23,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "yadif.h" typedef struct ThreadData { diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index e74bd87092..2575237884 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -24,7 +24,6 @@ #include "libavutil/cuda_check.h" #include "filters.h" -#include "internal.h" #include "yadif.h" #include "cuda/load_helper.h" diff --git a/libavfilter/vf_yadif_videotoolbox.m b/libavfilter/vf_yadif_videotoolbox.m index f77e7e86b5..85942e8321 100644 --- a/libavfilter/vf_yadif_videotoolbox.m +++ b/libavfilter/vf_yadif_videotoolbox.m @@ -20,7 +20,6 @@ */ #include "filters.h" -#include "internal.h" #include "metal/utils.h" #include "yadif.h" #include "libavutil/avassert.h" diff --git a/libavfilter/vf_yaepblur.c b/libavfilter/vf_yaepblur.c index c48d99762c..513404734f 100644 --- a/libavfilter/vf_yaepblur.c +++ b/libavfilter/vf_yaepblur.c @@ -32,7 +32,6 @@ #include "libavutil/imgutils.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct YAEPContext { diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index e98a8ea408..8a4d57b7ab 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -23,7 +23,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "libswscale/swscale.h" diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 5f473cfa25..2142a85bfc 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -33,7 +33,6 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" #include "libavutil/eval.h" #include "libavutil/internal.h" diff --git a/libavfilter/video.c b/libavfilter/video.c index b8a815eb01..1de7f2ef59 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -32,7 +32,6 @@ #include "avfilter_internal.h" #include "filters.h" #include "framepool.h" -#include "internal.h" #include "video.h" const AVFilterPad ff_video_default_filterpad[1] = { diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c index 4f61f84500..cc8cf1a13c 100644 --- a/libavfilter/vsink_nullsink.c +++ b/libavfilter/vsink_nullsink.c @@ -18,7 +18,6 @@ #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "libavutil/internal.h" static int filter_frame(AVFilterLink *link, AVFrame *frame) diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c index 0159d1e508..c831072df8 100644 --- a/libavfilter/vsrc_cellauto.c +++ b/libavfilter/vsrc_cellauto.c @@ -34,7 +34,6 @@ #include "libavutil/avstring.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" typedef struct CellAutoContext { diff --git a/libavfilter/vsrc_ddagrab.c b/libavfilter/vsrc_ddagrab.c index c900e123b6..302c558d9f 100644 --- a/libavfilter/vsrc_ddagrab.c +++ b/libavfilter/vsrc_ddagrab.c @@ -44,7 +44,6 @@ #include "compat/w32dlfcn.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "vsrc_ddagrab_shaders.h" diff --git a/libavfilter/vsrc_gradients.c b/libavfilter/vsrc_gradients.c index 02c4965df6..201ca8f86e 100644 --- a/libavfilter/vsrc_gradients.c +++ b/libavfilter/vsrc_gradients.c @@ -21,7 +21,6 @@ #include "avfilter.h" #include "filters.h" #include "video.h" -#include "internal.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/lfg.h" diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c index 79200a6d0e..a624dbb63c 100644 --- a/libavfilter/vsrc_life.c +++ b/libavfilter/vsrc_life.c @@ -34,7 +34,6 @@ #include "libavutil/random_seed.h" #include "libavutil/avstring.h" #include "avfilter.h" -#include "internal.h" #include "filters.h" #include "formats.h" #include "video.h" diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c index c1a59fea6d..46b6854bf2 100644 --- a/libavfilter/vsrc_mandelbrot.c +++ b/libavfilter/vsrc_mandelbrot.c @@ -29,7 +29,6 @@ #include "avfilter.h" #include "filters.h" #include "video.h" -#include "internal.h" #include "libavutil/imgutils.h" #include "libavutil/mem.h" #include "libavutil/opt.h" diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c index 8383370470..b431656f61 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -27,7 +27,6 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" -#include "internal.h" #include "video.h" #define WIDTH 512 diff --git a/libavfilter/vsrc_perlin.c b/libavfilter/vsrc_perlin.c index 8fd140f225..f736d2b97c 100644 --- a/libavfilter/vsrc_perlin.c +++ b/libavfilter/vsrc_perlin.c @@ -27,7 +27,6 @@ #include "libavutil/lfg.h" #include "libavutil/opt.h" #include "avfilter.h" -#include "internal.h" #include "filters.h" #include "formats.h" #include "video.h" diff --git a/libavfilter/vsrc_sierpinski.c b/libavfilter/vsrc_sierpinski.c index e982422549..8cc6142a1e 100644 --- a/libavfilter/vsrc_sierpinski.c +++ b/libavfilter/vsrc_sierpinski.c @@ -26,7 +26,6 @@ #include "avfilter.h" #include "filters.h" #include "video.h" -#include "internal.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index ce4013643c..f14e36a95b 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -48,7 +48,6 @@ #include "filters.h" #include "filters.h" #include "formats.h" -#include "internal.h" #include "video.h" typedef struct TestSourceContext { diff --git a/libavfilter/vsrc_testsrc_vulkan.c b/libavfilter/vsrc_testsrc_vulkan.c index 4b297af158..77fa9a0ba1 100644 --- a/libavfilter/vsrc_testsrc_vulkan.c +++ b/libavfilter/vsrc_testsrc_vulkan.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "vulkan_spirv.h" -#include "internal.h" #include "filters.h" #include "colorspace.h" #include "video.h" diff --git a/libavfilter/yadif_common.c b/libavfilter/yadif_common.c index 3f5e0ebfb8..059b44ba22 100644 --- a/libavfilter/yadif_common.c +++ b/libavfilter/yadif_common.c @@ -22,7 +22,6 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "filters.h" -#include "internal.h" #include "video.h" #include "yadif.h" From patchwork Sat Aug 17 08:13:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51058 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp882008vqj; Sat, 17 Aug 2024 01:15:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEO6EtUszunO+v1Ib1bBzuNwv8SNvu0xh5+mDktScoO4HTkXB0+zywSnG/qxH9NBO0VEVYjWtmaADlDRmPeSaaGhqo6MMhpHdPKg== X-Google-Smtp-Source: AGHT+IHmI0HNKWKq1DLNmcA1HlbXso8ia2vyooswCwwkKtCIRTMQQJjtMVANt6IS2JEZEOfIro/a X-Received: by 2002:a05:6512:3512:b0:52c:dba6:b4c8 with SMTP id 2adb3069b0e04-5331c6a20ecmr2513339e87.13.1723882515369; Sat, 17 Aug 2024 01:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882515; cv=none; d=google.com; s=arc-20160816; b=iz3vBWMNm4xJxjODoeH7cPK2eKUdI66JsO7d08cw12I4uvp8gFxlMum8o/hQdGCgRV GLb9ASnLZvSPkqE11cLckrCZj/V48uu/yLTMt3aX3oJweA2zqJp0gCHqcPZURjE/K3dG 2Oq0TiGvBN64ORZjD2ffQ1HZV9xfoPkXLShIoi4pXBvFpJw0THowwFLrCLdA8kksOqrk 9832tPebHkflsLQ8+1czBxwgAmqqkcL5JkYANVVZ+RhPzOVa0VpZIsxhYX23v/ifP1hS PK2j1nKyv94ztDU4SNbOR0ljLa7vltg4DKBwww01qgnlJygFYoqUdjM/qnVtxucNYzvO yGBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=EM+qNwJH/q3+tAXBMDNLu5H0bMZHpxHVddZPJ1nQpoA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mHPS+GNGZBPNPugoxkBLhVdAdfA7AG5dyKdaGinhaXL109SMygq81Ahudo6KIfhkQX ho8eSab6om99TNWCW17jnOjrpZrsHgXE2qd37lWOXmtOd4O4/Nz6m1FYosjLqh/QVYcv m+V3/+TPssPB9a9u/lC4z/DmsMWj19Zpe2D50XUnCMGxIYxfKmXHY3CXAtqzotul9ted +G1xc7jI439EyXLXN5iA0ob64is/0gRotbwBEtGv94jcjsbcokxKRQo+XNE/eZSrJvCJ 0sVS7keQpsAILMJugf0WrNnWtKG6EwCSAUEAmPTFUxw39cQ7U6mS/r/cJB6K9CO9U55S owqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=UdN4ocLy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-5330d3aa32fsi1564223e87.40.2024.08.17.01.15.15; Sat, 17 Aug 2024 01:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=UdN4ocLy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22F9768DD0F; Sat, 17 Aug 2024 11:14:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C02868DCFD for ; Sat, 17 Aug 2024 11:14:14 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=UdN4ocLy; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id D5F174DEE for ; Sat, 17 Aug 2024 10:14:10 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 652B4Cbr9MeX for ; Sat, 17 Aug 2024 10:14:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=5pjvSVgYO2YWFymn5CyHXjTcPJ0HNyDslPX88meYOdk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UdN4ocLyGE2KhEOnZcAEXedg26QtWrbmIoDVqlwkUR2vm1jPU8HUWVee/yyV6aoNp fZWSAE5js2SWdxAIC6lVdBJO9I8H56LyR7b11wa+CJJ6otW4TxxDO2LAuiZgyhS6/d 1oh+NOdxaT/99HOVBdRuEn54/jyov6Fx7W2A9jPJV+QJD+NPsjoxk0brD4nezDJQm1 xENa7r1hUEDxIzhj1nxLa/9un1nICHVFd6fCL8qxe0HOBCl7GX0RuvxRlx1QTKUeDO mf+Cz9Gb+ApRFdoJPbzB3PCdo8SrPJRRjMRq17GkVQJDnwpEzUgMeFaCj2RpYC0OgB eHM1xeKF714fQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id C0AB74DF6 for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 7A6F13A293C for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:57 +0200 Message-ID: <20240817081358.2354-7-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] lavfi/filters: move functions only used by generic code to avfilter_internal.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pfT8afqp8L4V --- libavfilter/avfilter_internal.h | 15 +++++++++++++++ libavfilter/filters.h | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libavfilter/avfilter_internal.h b/libavfilter/avfilter_internal.h index 3b8d6fe60e..8386183745 100644 --- a/libavfilter/avfilter_internal.h +++ b/libavfilter/avfilter_internal.h @@ -184,4 +184,19 @@ void ff_tlog_link(void *ctx, AVFilterLink *link, int end); */ int ff_filter_graph_run_once(AVFilterGraph *graph); +/** + * Process the commands queued in the link up to the time of the frame. + * Commands will trigger the process_command() callback. + * @return >= 0 or AVERROR code. + */ +int ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame); + +/** + * Evaluate the timeline expression of the link for the time and properties + * of the frame. + * @return >0 if enabled, 0 if disabled + * @note It does not update link->dst->is_disabled. + */ +int ff_inlink_evaluate_timeline_at_frame(AVFilterLink *link, const AVFrame *frame); + #endif /* AVFILTER_AVFILTER_INTERNAL_H */ diff --git a/libavfilter/filters.h b/libavfilter/filters.h index 4e763a94c0..636753b26a 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -303,21 +303,6 @@ enum FilterFormatsState { */ void ff_filter_set_ready(AVFilterContext *filter, unsigned priority); -/** - * Process the commands queued in the link up to the time of the frame. - * Commands will trigger the process_command() callback. - * @return >= 0 or AVERROR code. - */ -int ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame); - -/** - * Evaluate the timeline expression of the link for the time and properties - * of the frame. - * @return >0 if enabled, 0 if disabled - * @note It does not update link->dst->is_disabled. - */ -int ff_inlink_evaluate_timeline_at_frame(AVFilterLink *link, const AVFrame *frame); - /** * Get the number of frames available on the link. * @return the number of frames available in the link fifo. From patchwork Sat Aug 17 08:13:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp881941vqj; Sat, 17 Aug 2024 01:15:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWnAl83B53uzoMUwdZ+Zy5YwIj6L+egyJHGvIyCtmis/vQQTZNH/5yUV4XkSBtqXy1q4Hq36OPoIV3uI59V1T8j/qIq85dpsfWqg== X-Google-Smtp-Source: AGHT+IGG+kF+AVnlI+wq2kovxA7I8RMXJMLl58BpzrFXv+yA+ACWxJ9/MOagJ4U4d4KhKBg1OmES X-Received: by 2002:a05:6402:5209:b0:599:b77c:7b5c with SMTP id 4fb4d7f45d1cf-5beca91d36emr1849703a12.5.1723882505775; Sat, 17 Aug 2024 01:15:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723882505; cv=none; d=google.com; s=arc-20160816; b=f4DFD+UWzyPOs8FfFtl72MWHvGUQM0JELcQilW2+lyj2koi/Oomv5R98vcc5vRj1zq qI04aL+QYXxfpHQ8RLjt48m3olDaQ80Z/+9G9Vactej+FmFaIMHT+tozKSuih7xLtyl7 LFO4A4lq2bB4810ZrsxkjT69nVyVvyHwjhAYZM+IXvujVOBWITXwctpGJ6VwKpYOnTKM 9QB0ekgSHC4lfqPYTmOEnrPnilEkOYLu9X/kmrhjz5t75wc+WXSd4MNEHEfy1lEGpdcX fJcwufbnB8p8x13l5l6NV5YQlmW01vEh6QF4wy/VSPOQhp9EYefeAlozQev7A7ayVHGK eSvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=sYA5/ni5XG/kNzGF+xLhzWcgJVvA4OSWP2ri3Xbj4cc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=r0RtGoMRh7KdALTRdIvou+vc7AGE92Byd5aMaZo0y5xcrChbDYQvCZ24wEGa3nSaJj yLd3BQhbA+eEs+1gfmT64NTfdUjGj1H0I/tbqhWOagj0srdxeKlqDT3ZahnFvSJIfY6M lKfmFV/gEVg7tZSD1HmANf/v6HxcFwvI21k90od7rRb5kveaihMxkuOp+bg7iRVXUeU+ HdCp9PjA02bmMIbNldGdg21C05KN1rpsMBOlAunmW8zsbGnVSfAkb3lG5yII+JodrkAq kAV5DCxROJoSRt2dMUIE5/HKFV5AAL6M+kqsdRaBCe1NeRW5h/hHVnKYUZm1TTS2Qi/+ ziIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=NYJ6nWMB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5bebbde91f2si3069072a12.150.2024.08.17.01.15.05; Sat, 17 Aug 2024 01:15:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=NYJ6nWMB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D275D68DCFE; Sat, 17 Aug 2024 11:14:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15F1D68DCFB for ; Sat, 17 Aug 2024 11:14:14 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=NYJ6nWMB; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 90CB64DE4 for ; Sat, 17 Aug 2024 10:14:10 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id lMFgsanGSSZB for ; Sat, 17 Aug 2024 10:14:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1723882446; bh=kXFe1IAOls3tll8afMsOlEGIti1Qo6knl2FE3DKDt6g=; h=From:To:Subject:Date:In-Reply-To:References:From; b=NYJ6nWMBrpTjMqCHdZE7kagDsik5XXeSN5/ShScnIFn5zNvNpkKpm9RcqgnL8y8bR /+2vPUmwFLXdxkz4CnH6km/7Dd6pcqBN0G3WMxT7J0xd/j57vtKw96kFlvgQKIZJDw v6rVzGonVH01DRHoDRFWDAoGTND0nmkLdMFh8yWEca/OAkzJTpAmhlx0lDeldoxUaw qq4oUoBIxag7CIOvlZvjHkMCvCEEqJacpdEiEetebrUM56hvU1+V1HtnDEGIk/5ZHC Kp99o7BUEW7tMZtTWqTveJgbWUmchqt0zuHyqBmh9BkYyq72IwXuc6bOd9VjrNyAlE wANW5ZZGCTfVA== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id BE64B4DF1 for ; Sat, 17 Aug 2024 10:14:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8614E3A299F for ; Sat, 17 Aug 2024 10:14:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2024 10:13:58 +0200 Message-ID: <20240817081358.2354-8-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817081358.2354-1-anton@khirnov.net> References: <20240817081358.2354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] lavfi: make FFFilterContext private to generic code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dKvxwCBH1Hl5 Nothing in it needs to be visible to filters. --- libavfilter/avfilter.c | 6 ++++++ libavfilter/avfilter_internal.h | 18 ++++++++++++++++++ libavfilter/filters.h | 25 ++----------------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c89a7ab508..8a2a9e0593 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1647,3 +1647,9 @@ int ff_outlink_frame_wanted(AVFilterLink *link) FilterLinkInternal * const li = ff_link_internal(link); return li->frame_wanted_out; } + +int ff_filter_execute(AVFilterContext *ctx, avfilter_action_func *func, + void *arg, int *ret, int nb_jobs) +{ + return fffilterctx(ctx)->execute(ctx, func, arg, ret, nb_jobs); +} diff --git a/libavfilter/avfilter_internal.h b/libavfilter/avfilter_internal.h index 8386183745..ec3933b1d1 100644 --- a/libavfilter/avfilter_internal.h +++ b/libavfilter/avfilter_internal.h @@ -92,6 +92,24 @@ static inline FilterLinkInternal *ff_link_internal(AVFilterLink *link) return (FilterLinkInternal*)link; } +typedef struct FFFilterContext { + /** + * The public AVFilterContext. See avfilter.h for it. + */ + AVFilterContext p; + + avfilter_execute_func *execute; + + // 1 when avfilter_init_*() was successfully called on this filter + // 0 otherwise + int initialized; +} FFFilterContext; + +static inline FFFilterContext *fffilterctx(AVFilterContext *ctx) +{ + return (FFFilterContext*)ctx; +} + typedef struct AVFilterCommand { double time; ///< time expressed in seconds char *command; ///< command diff --git a/libavfilter/filters.h b/libavfilter/filters.h index 636753b26a..0053ad4303 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -199,24 +199,6 @@ static inline FilterLink* ff_filter_link(AVFilterLink *link) return (FilterLink*)link; } -typedef struct FFFilterContext { - /** - * The public AVFilterContext. See avfilter.h for it. - */ - AVFilterContext p; - - avfilter_execute_func *execute; - - // 1 when avfilter_init_*() was successfully called on this filter - // 0 otherwise - int initialized; -} FFFilterContext; - -static inline FFFilterContext *fffilterctx(AVFilterContext *ctx) -{ - return (FFFilterContext*)ctx; -} - /** * The filter is aware of hardware frames, and any hardware frame context * should not be automatically propagated through it. @@ -614,10 +596,7 @@ int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p); */ int ff_fmt_is_in(int fmt, const int *fmts); -static av_always_inline int ff_filter_execute(AVFilterContext *ctx, avfilter_action_func *func, - void *arg, int *ret, int nb_jobs) -{ - return fffilterctx(ctx)->execute(ctx, func, arg, ret, nb_jobs); -} +int ff_filter_execute(AVFilterContext *ctx, avfilter_action_func *func, + void *arg, int *ret, int nb_jobs); #endif /* AVFILTER_FILTERS_H */