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 /libavutil | |
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 'libavutil')
36 files changed, 106 insertions, 52 deletions
diff --git a/libavutil/adler32.c b/libavutil/adler32.c index f7d3062265..7124f18802 100644 --- a/libavutil/adler32.c +++ b/libavutil/adler32.c @@ -32,8 +32,8 @@ #include "config.h" #include "adler32.h" -#include "common.h" #include "intreadwrite.h" +#include "macros.h" #define BASE 65521L /* largest prime smaller than 65536 */ diff --git a/libavutil/aes.c b/libavutil/aes.c index 397ea77389..029d738f87 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -20,11 +20,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" +#include <string.h> + +#include "config.h" #include "aes.h" #include "aes_internal.h" +#include "error.h" #include "intreadwrite.h" -#include "timer.h" +#include "macros.h" +#include "mem.h" const int av_aes_size= sizeof(AVAES); diff --git a/libavutil/aes_ctr.c b/libavutil/aes_ctr.c index 517d09cf96..c2d6d570e7 100644 --- a/libavutil/aes_ctr.c +++ b/libavutil/aes_ctr.c @@ -19,10 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" +#include <string.h> + #include "aes_ctr.h" #include "aes.h" #include "aes_internal.h" +#include "macros.h" +#include "mem.h" #include "random_seed.h" #define AES_BLOCK_SIZE (16) diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c index a034407d14..7061e6d965 100644 --- a/libavutil/avsscanf.c +++ b/libavutil/avsscanf.c @@ -21,16 +21,18 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <errno.h> +#include <limits.h> +#include <math.h> #include <stdarg.h> +#include <stddef.h> #include <stdint.h> #include <stdio.h> #include <string.h> #include <float.h> -#include "config.h" -#include "common.h" #include "avstring.h" -#include "bprint.h" +#include "libm.h" typedef struct FFFILE { size_t buf_size; diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 49e8df55aa..5ddbe9219e 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -19,17 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <limits.h> #include <stdarg.h> #include <stdint.h> #include <stdio.h> #include <string.h> #include "config.h" -#include "common.h" #include "mem.h" #include "avassert.h" #include "avstring.h" #include "bprint.h" +#include "error.h" +#include "macros.h" +#include "version.h" int av_strstart(const char *str, const char *pfx, const char **ptr) { diff --git a/libavutil/base64.c b/libavutil/base64.c index a1316b9438..3e66f4fcbe 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -24,10 +24,12 @@ * @author Ryan Martell <rdm4@martellventures.com> (with lots of Michael) */ -#include "common.h" +#include <limits.h> +#include <stddef.h> + #include "base64.h" +#include "error.h" #include "intreadwrite.h" -#include "timer.h" /* ---------------- private code */ static const uint8_t map2[256] = diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c index abc0e03d4d..6df60150ea 100644 --- a/libavutil/blowfish.c +++ b/libavutil/blowfish.c @@ -21,8 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avutil.h" -#include "common.h" +#include <string.h> + +#include "attributes.h" #include "intreadwrite.h" #include "mem.h" #include "blowfish.h" diff --git a/libavutil/bprint.c b/libavutil/bprint.c index ea51d9b09c..5b540ebc9e 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -18,15 +18,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <string.h> #include <time.h> #include "avstring.h" #include "bprint.h" -#include "common.h" #include "compat/va_copy.h" #include "error.h" +#include "macros.h" #include "mem.h" #define av_bprint_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size)) diff --git a/libavutil/buffer_internal.h b/libavutil/buffer_internal.h index bdff1b5b32..adb916aaa2 100644 --- a/libavutil/buffer_internal.h +++ b/libavutil/buffer_internal.h @@ -22,7 +22,6 @@ #include <stdatomic.h> #include <stdint.h> -#include "internal.h" #include "buffer.h" #include "thread.h" diff --git a/libavutil/camellia.c b/libavutil/camellia.c index f33ee9babc..3fc3b08291 100644 --- a/libavutil/camellia.c +++ b/libavutil/camellia.c @@ -18,9 +18,13 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include <string.h> + #include "camellia.h" -#include "common.h" +#include "error.h" #include "intreadwrite.h" +#include "mem.h" #include "attributes.h" #define LR32(x,c) ((x) << (c) | (x) >> (32 - (c))) diff --git a/libavutil/cast5.c b/libavutil/cast5.c index 445eb55c12..0bf8ae9929 100644 --- a/libavutil/cast5.c +++ b/libavutil/cast5.c @@ -18,9 +18,13 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include <string.h> + #include "cast5.h" -#include "common.h" +#include "error.h" #include "intreadwrite.h" +#include "mem.h" #include "attributes.h" #define IA(x) ((x) >> 24) diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index ac773a9e63..b9507b1bff 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -24,12 +24,14 @@ */ #include <stdint.h> +#include <stdlib.h> +#include <string.h> -#include "avstring.h" -#include "avutil.h" #include "channel_layout.h" #include "bprint.h" #include "common.h" +#include "error.h" +#include "macros.h" struct channel_name { const char *name; diff --git a/libavutil/color_utils.c b/libavutil/color_utils.c index eb8bc7b5fc..5e221fb798 100644 --- a/libavutil/color_utils.c +++ b/libavutil/color_utils.c @@ -21,7 +21,6 @@ #include <stddef.h> #include <math.h> -#include "common.h" #include "libavutil/color_utils.h" #include "libavutil/pixfmt.h" diff --git a/libavutil/crc.c b/libavutil/crc.c index c45ea63a62..703b56f4e0 100644 --- a/libavutil/crc.c +++ b/libavutil/crc.c @@ -23,8 +23,8 @@ #include "thread.h" #include "avassert.h" #include "bswap.h" -#include "common.h" #include "crc.h" +#include "error.h" #if CONFIG_HARDCODED_TABLES static const AVCRC av_crc_table[AV_CRC_MAX][257] = { diff --git a/libavutil/des.c b/libavutil/des.c index 6957666184..e0e9a86660 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -19,10 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include <stdint.h> -#include "avutil.h" -#include "common.h" +#include "attributes.h" +#include "error.h" #include "intreadwrite.h" #include "mem.h" #include "des.h" diff --git a/libavutil/error.c b/libavutil/error.c index b96304837b..938a8bc000 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -18,9 +18,12 @@ #undef _GNU_SOURCE #define _XOPEN_SOURCE 600 /* XSI-compliant version of strerror_r */ -#include "avutil.h" +#include <stdio.h> +#include <string.h> +#include "config.h" #include "avstring.h" -#include "common.h" +#include "error.h" +#include "macros.h" struct error_entry { int num; diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c index f1b195f184..098ef9c061 100644 --- a/libavutil/fixed_dsp.c +++ b/libavutil/fixed_dsp.c @@ -45,6 +45,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "common.h" #include "fixed_dsp.h" static void vector_fmul_add_c(int *dst, const int *src0, const int *src1, const int *src2, int len){ diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h index f554cb5038..fec806ff2d 100644 --- a/libavutil/fixed_dsp.h +++ b/libavutil/fixed_dsp.h @@ -49,8 +49,8 @@ #define AVUTIL_FIXED_DSP_H #include <stdint.h> +#include "config.h" #include "attributes.h" -#include "common.h" #include "libavcodec/mathops.h" typedef struct AVFixedDSPContext { diff --git a/libavutil/lls.c b/libavutil/lls.c index 3a136baa2d..ea2d80e662 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -28,8 +28,8 @@ #include <math.h> #include <string.h> +#include "config.h" #include "attributes.h" -#include "internal.h" #include "lls.h" static void update_lls(LLSModel *m, const double *var) diff --git a/libavutil/log.c b/libavutil/log.c index 66defa9c42..5948e50467 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -32,9 +32,11 @@ #if HAVE_IO_H #include <io.h> #endif +#include <inttypes.h> #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> -#include "avutil.h" +#include <string.h> #include "bprint.h" #include "common.h" #include "internal.h" diff --git a/libavutil/lzo.c b/libavutil/lzo.c index 1ae076e335..bcbe2c861d 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -19,13 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <limits.h> +#include <stdint.h> #include <string.h> -#include "avutil.h" #include "avassert.h" -#include "common.h" #include "intreadwrite.h" #include "lzo.h" +#include "macros.h" +#include "mem.h" /// Define if we may write up to 12 bytes beyond the output buffer. #define OUTBUF_PADDED 1 diff --git a/libavutil/mem.c b/libavutil/mem.c index 194d880587..a0c9a42849 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -37,10 +37,13 @@ #include <malloc.h> #endif -#include "avutil.h" -#include "common.h" +#include "attributes.h" +#include "avassert.h" #include "dynarray.h" +#include "error.h" +#include "internal.h" #include "intreadwrite.h" +#include "macros.h" #include "mem.h" #ifdef MALLOC_PREFIX @@ -59,8 +62,6 @@ void free(void *ptr); #endif /* MALLOC_PREFIX */ -#include "mem_internal.h" - #define ALIGN (HAVE_AVX512 ? 64 : (HAVE_AVX ? 32 : 16)) /* NOTE: if you want to override these functions with your own diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c index ebee3d6f90..820889a143 100644 --- a/libavutil/pixelutils.c +++ b/libavutil/pixelutils.c @@ -16,12 +16,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> + #include "config.h" -#include "common.h" #include "pixelutils.h" -#include "internal.h" #if CONFIG_PIXELUTILS +#include <stdlib.h> +#include <string.h> + +#include "attributes.h" +#include "macros.h" #include "x86/pixelutils.h" @@ -60,7 +65,8 @@ static const av_pixelutils_sad_fn sad_c[] = { block_sad_16x16_c, block_sad_32x32_c, }; - +#else +#include "log.h" #endif /* CONFIG_PIXELUTILS */ av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits, int aligned, void *log_ctx) diff --git a/libavutil/qsort.h b/libavutil/qsort.h index 39b7a08852..6014f88be3 100644 --- a/libavutil/qsort.h +++ b/libavutil/qsort.h @@ -21,7 +21,7 @@ #ifndef AVUTIL_QSORT_H #define AVUTIL_QSORT_H -#include "common.h" +#include "macros.h" /** diff --git a/libavutil/rc4.c b/libavutil/rc4.c index ffcb112142..74c1f4892e 100644 --- a/libavutil/rc4.c +++ b/libavutil/rc4.c @@ -20,8 +20,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avutil.h" -#include "common.h" + +#include "error.h" +#include "macros.h" #include "mem.h" #include "rc4.h" diff --git a/libavutil/ripemd.c b/libavutil/ripemd.c index b8e9761a24..e170c69f42 100644 --- a/libavutil/ripemd.c +++ b/libavutil/ripemd.c @@ -22,10 +22,12 @@ #include <stddef.h> #include <string.h> +#include "config.h" #include "attributes.h" -#include "avutil.h" #include "bswap.h" +#include "error.h" #include "intreadwrite.h" +#include "macros.h" #include "ripemd.h" #include "mem.h" diff --git a/libavutil/sha.c b/libavutil/sha.c index ab42869c7b..0df044032f 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -23,9 +23,10 @@ #include <string.h> +#include "config.h" #include "attributes.h" -#include "avutil.h" #include "bswap.h" +#include "error.h" #include "sha.h" #include "intreadwrite.h" #include "mem.h" diff --git a/libavutil/sha512.c b/libavutil/sha512.c index 97aaaa865c..0574a46f94 100644 --- a/libavutil/sha512.c +++ b/libavutil/sha512.c @@ -23,9 +23,10 @@ #include <string.h> +#include "config.h" #include "attributes.h" -#include "avutil.h" #include "bswap.h" +#include "error.h" #include "sha512.h" #include "intreadwrite.h" #include "mem.h" diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 279fcc1ff3..9c29ab01b5 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -21,7 +21,8 @@ #include <string.h> #include "avstring.h" -#include "common.h" +#include "frame.h" +#include "macros.h" #include "mem.h" #include "stereo3d.h" diff --git a/libavutil/tea.c b/libavutil/tea.c index b138f8bea1..93a3795368 100644 --- a/libavutil/tea.c +++ b/libavutil/tea.c @@ -22,9 +22,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avutil.h" -#include "common.h" +#include <string.h> #include "intreadwrite.h" +#include "mem.h" #include "tea.h" typedef struct AVTEA { diff --git a/libavutil/tests/color_utils.c b/libavutil/tests/color_utils.c index ea0127158b..4bdc550330 100644 --- a/libavutil/tests/color_utils.c +++ b/libavutil/tests/color_utils.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include "libavutil/color_utils.c" +#include "libavutil/macros.h" int main(int argc, char *argv[]) { diff --git a/libavutil/tests/pixelutils.c b/libavutil/tests/pixelutils.c index 2f807584b3..927c8d9217 100644 --- a/libavutil/tests/pixelutils.c +++ b/libavutil/tests/pixelutils.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> + +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/pixelutils.c" #define W1 320 diff --git a/libavutil/twofish.c b/libavutil/twofish.c index 649b4bc41b..9f9687eccb 100644 --- a/libavutil/twofish.c +++ b/libavutil/twofish.c @@ -18,9 +18,13 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include <string.h> + #include "twofish.h" -#include "common.h" +#include "error.h" #include "intreadwrite.h" +#include "mem.h" #include "attributes.h" #define LR(x, n) ((x) << (n) | (x) >> (32 - (n))) diff --git a/libavutil/video_enc_params.c b/libavutil/video_enc_params.c index 7d903af385..54bfed0ed9 100644 --- a/libavutil/video_enc_params.c +++ b/libavutil/video_enc_params.c @@ -16,12 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <limits.h> #include <stddef.h> #include <stdint.h> #include "buffer.h" -#include "common.h" #include "frame.h" #include "mem.h" #include "video_enc_params.h" diff --git a/libavutil/x86/imgutils_init.c b/libavutil/x86/imgutils_init.c index 4ea398205e..91a16cf594 100644 --- a/libavutil/x86/imgutils_init.c +++ b/libavutil/x86/imgutils_init.c @@ -21,9 +21,8 @@ #include "libavutil/cpu.h" #include "libavutil/error.h" -#include "libavutil/imgutils.h" #include "libavutil/imgutils_internal.h" -#include "libavutil/internal.h" +#include "libavutil/macros.h" #include "cpu.h" diff --git a/libavutil/xtea.c b/libavutil/xtea.c index f7892af9fb..6f376c365c 100644 --- a/libavutil/xtea.c +++ b/libavutil/xtea.c @@ -28,8 +28,8 @@ * @ingroup lavu_xtea */ -#include "avutil.h" -#include "common.h" +#include <string.h> +#include "config.h" #include "intreadwrite.h" #include "mem.h" #include "xtea.h" |