diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-01 08:36:09 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-24 12:56:49 +0100 |
commit | 636631d9db82f5e86330ab42dacc8a106684b349 (patch) | |
tree | 86274afefd600d2ef634dc8d1252807ce9f16721 /libavfilter | |
parent | 84f16bb5e68dc47eca4dc96b3391c58471cd7328 (diff) |
Remove unnecessary libavutil/(avutil|common|internal).h inclusions
Some of these were made possible by moving several common macros to
libavutil/macros.h.
While just at it, also improve the other headers a bit.
Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_afir.h | 13 | ||||
-rw-r--r-- | libavfilter/af_volume.h | 4 | ||||
-rw-r--r-- | libavfilter/avfiltergraph.c | 2 | ||||
-rw-r--r-- | libavfilter/colorspace.h | 2 | ||||
-rw-r--r-- | libavfilter/ebur128.c | 3 | ||||
-rw-r--r-- | libavfilter/motion_estimation.c | 1 | ||||
-rw-r--r-- | libavfilter/motion_estimation.h | 2 | ||||
-rw-r--r-- | libavfilter/pthread.c | 6 |
8 files changed, 16 insertions, 17 deletions
diff --git a/libavfilter/af_afir.h b/libavfilter/af_afir.h index 8f40c1b2f4..cf00dbfc66 100644 --- a/libavfilter/af_afir.h +++ b/libavfilter/af_afir.h @@ -21,15 +21,14 @@ #ifndef AVFILTER_AFIR_H #define AVFILTER_AFIR_H +#include <stddef.h> +#include <stdint.h> + #include "libavutil/tx.h" -#include "libavutil/common.h" #include "libavutil/float_dsp.h" -#include "libavutil/opt.h" - -#include "audio.h" -#include "avfilter.h" -#include "formats.h" -#include "internal.h" +#include "libavutil/frame.h" +#include "libavutil/log.h" +#include "libavutil/rational.h" typedef struct AudioFIRSegment { int nb_partitions; diff --git a/libavfilter/af_volume.h b/libavfilter/af_volume.h index af46e34ff6..c97902969e 100644 --- a/libavfilter/af_volume.h +++ b/libavfilter/af_volume.h @@ -24,10 +24,10 @@ #ifndef AVFILTER_VOLUME_H #define AVFILTER_VOLUME_H -#include "libavutil/common.h" +#include <stdint.h> #include "libavutil/eval.h" #include "libavutil/float_dsp.h" -#include "libavutil/opt.h" +#include "libavutil/log.h" #include "libavutil/samplefmt.h" enum PrecisionType { diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b8b432e98b..74bfbe2103 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -25,11 +25,9 @@ #include <string.h> #include "libavutil/avassert.h" -#include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/imgutils.h" -#include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/colorspace.h b/libavfilter/colorspace.h index 459a5df60d..a4c5078d5f 100644 --- a/libavfilter/colorspace.h +++ b/libavfilter/colorspace.h @@ -20,8 +20,8 @@ #ifndef AVFILTER_COLORSPACE_H #define AVFILTER_COLORSPACE_H -#include "libavutil/common.h" #include "libavutil/frame.h" +#include "libavutil/pixfmt.h" #define REFERENCE_WHITE 100.0f diff --git a/libavfilter/ebur128.c b/libavfilter/ebur128.c index 1a85a90360..062099e206 100644 --- a/libavfilter/ebur128.c +++ b/libavfilter/ebur128.c @@ -47,7 +47,8 @@ #include <limits.h> #include <math.h> /* You may have to define _USE_MATH_DEFINES if you use MSVC */ -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" diff --git a/libavfilter/motion_estimation.c b/libavfilter/motion_estimation.c index 0f9ba21784..2bf5ce6155 100644 --- a/libavfilter/motion_estimation.c +++ b/libavfilter/motion_estimation.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "motion_estimation.h" static const int8_t sqr1[8][2] = {{ 0,-1}, { 0, 1}, {-1, 0}, { 1, 0}, {-1,-1}, {-1, 1}, { 1,-1}, { 1, 1}}; diff --git a/libavfilter/motion_estimation.h b/libavfilter/motion_estimation.h index 6ae29dd9e3..be627ec3b0 100644 --- a/libavfilter/motion_estimation.h +++ b/libavfilter/motion_estimation.h @@ -21,7 +21,7 @@ #ifndef AVFILTER_MOTION_ESTIMATION_H #define AVFILTER_MOTION_ESTIMATION_H -#include "libavutil/avutil.h" +#include <stdint.h> #define AV_ME_METHOD_ESA 1 #define AV_ME_METHOD_TSS 2 diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c index 34fc699505..1a063d3cc0 100644 --- a/libavfilter/pthread.c +++ b/libavfilter/pthread.c @@ -21,11 +21,11 @@ * Libavfilter multithreading support */ -#include "config.h" +#include <stddef.h> -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" -#include "libavutil/thread.h" #include "libavutil/slicethread.h" #include "avfilter.h" |