diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-23 14:06:58 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-07 00:42:10 +0200 |
commit | e3b355c0be85ec47ee8b3d7790ad4c4fa26827c0 (patch) | |
tree | a4cd74db661bc69b42348cd965326dffd6c2d6f4 /libavutil | |
parent | c3e3ea3c8846486dfe81b3761584f7c98ada9c75 (diff) |
avutil/mem: Don't include avutil.h
It is not necessary at all. So remove it.
This also breaks an inclusion cycle mem.h->avutil.h->common.h->mem.h.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/dict.c | 4 | ||||
-rw-r--r-- | libavutil/encryption_info.c | 2 | ||||
-rw-r--r-- | libavutil/fifo.c | 1 | ||||
-rw-r--r-- | libavutil/file.c | 1 | ||||
-rw-r--r-- | libavutil/hash.c | 2 | ||||
-rw-r--r-- | libavutil/hmac.c | 1 | ||||
-rw-r--r-- | libavutil/md5.c | 2 | ||||
-rw-r--r-- | libavutil/mem.h | 4 | ||||
-rw-r--r-- | libavutil/murmur3.c | 1 | ||||
-rw-r--r-- | libavutil/tests/lzo.c | 2 | ||||
-rw-r--r-- | libavutil/tests/murmur3.c | 3 | ||||
-rw-r--r-- | libavutil/tests/pixdesc.c | 1 | ||||
-rw-r--r-- | libavutil/threadmessage.c | 3 | ||||
-rw-r--r-- | libavutil/timestamp.h | 2 | ||||
-rw-r--r-- | libavutil/tx_priv.h | 1 | ||||
-rw-r--r-- | libavutil/wchar_filename.h | 2 |
16 files changed, 27 insertions, 5 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index f673977a98..7f23d5336a 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> +#include <stdio.h> #include <string.h> #include "avassert.h" #include "avstring.h" #include "dict.h" #include "dict_internal.h" -#include "internal.h" +#include "error.h" #include "mem.h" #include "time_internal.h" #include "bprint.h" diff --git a/libavutil/encryption_info.c b/libavutil/encryption_info.c index 09486c4c85..e4ff015b37 100644 --- a/libavutil/encryption_info.c +++ b/libavutil/encryption_info.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "encryption_info.h" #include "mem.h" #include "intreadwrite.h" diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 51a5af6f39..9b32f708fc 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -293,6 +293,7 @@ void av_fifo_freep2(AVFifo **f) #if FF_API_FIFO_OLD_API +#include "internal.h" FF_DISABLE_DEPRECATION_WARNINGS #define OLD_FIFO_SIZE_MAX (size_t)FFMIN3(INT_MAX, UINT32_MAX, SIZE_MAX) diff --git a/libavutil/file.c b/libavutil/file.c index 6a2f3aa91c..cc17885bcc 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "error.h" #include "file.h" #include "file_open.h" #include "internal.h" diff --git a/libavutil/hash.c b/libavutil/hash.c index 9a49748189..12333982fb 100644 --- a/libavutil/hash.c +++ b/libavutil/hash.c @@ -20,6 +20,8 @@ #include <stddef.h> #include <stdint.h> +#include <stdio.h> +#include <string.h> #include "hash.h" #include "adler32.h" diff --git a/libavutil/hmac.c b/libavutil/hmac.c index 7d241fc73e..302d7b04cf 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -23,6 +23,7 @@ #include <string.h> #include "attributes.h" +#include "error.h" #include "hmac.h" #include "md5.h" #include "sha.h" diff --git a/libavutil/md5.c b/libavutil/md5.c index 0170d8dd3f..c01820da2d 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -31,9 +31,11 @@ */ #include <stdint.h> +#include <string.h> #include "bswap.h" #include "intreadwrite.h" +#include "macros.h" #include "mem.h" #include "md5.h" diff --git a/libavutil/mem.h b/libavutil/mem.h index 62b4ca6e50..ab7648ac57 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -27,12 +27,10 @@ #ifndef AVUTIL_MEM_H #define AVUTIL_MEM_H -#include <limits.h> +#include <stddef.h> #include <stdint.h> #include "attributes.h" -#include "avutil.h" -#include "version.h" /** * @addtogroup lavu_mem diff --git a/libavutil/murmur3.c b/libavutil/murmur3.c index f2e2a9ea6c..c88a236a0c 100644 --- a/libavutil/murmur3.c +++ b/libavutil/murmur3.c @@ -20,6 +20,7 @@ #include <stddef.h> #include <stdint.h> +#include <string.h> #include "mem.h" #include "intreadwrite.h" #include "murmur3.h" diff --git a/libavutil/tests/lzo.c b/libavutil/tests/lzo.c index a5655dbfc5..d7a78a1696 100644 --- a/libavutil/tests/lzo.c +++ b/libavutil/tests/lzo.c @@ -19,6 +19,8 @@ */ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <lzo/lzo1x.h> #include "libavutil/log.h" diff --git a/libavutil/tests/murmur3.c b/libavutil/tests/murmur3.c index b8d6b1feee..7a793dac47 100644 --- a/libavutil/tests/murmur3.c +++ b/libavutil/tests/murmur3.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> +#include <stdio.h> + #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "libavutil/murmur3.h" diff --git a/libavutil/tests/pixdesc.c b/libavutil/tests/pixdesc.c index 34e2bea932..b13aba598b 100644 --- a/libavutil/tests/pixdesc.c +++ b/libavutil/tests/pixdesc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/log.h" #include "libavutil/pixdesc.c" int main(void){ diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c index f0e23f28fc..20b3882033 100644 --- a/libavutil/threadmessage.c +++ b/libavutil/threadmessage.c @@ -19,6 +19,9 @@ */ #include <limits.h> +#include <stddef.h> + +#include "error.h" #include "fifo.h" #include "mem.h" #include "threadmessage.h" diff --git a/libavutil/timestamp.h b/libavutil/timestamp.h index e082f01b40..9ae64da8a1 100644 --- a/libavutil/timestamp.h +++ b/libavutil/timestamp.h @@ -24,7 +24,7 @@ #ifndef AVUTIL_TIMESTAMP_H #define AVUTIL_TIMESTAMP_H -#include "common.h" +#include "avutil.h" #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64) #error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS diff --git a/libavutil/tx_priv.h b/libavutil/tx_priv.h index d5ff8e1421..d3fcdbf563 100644 --- a/libavutil/tx_priv.h +++ b/libavutil/tx_priv.h @@ -22,6 +22,7 @@ #include "tx.h" #include "thread.h" #include "mem_internal.h" +#include "common.h" #include "attributes.h" #ifdef TX_FLOAT diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 4f87e6f88b..868a30b532 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -21,6 +21,8 @@ #ifdef _WIN32 +#include <errno.h> +#include <stddef.h> #include <windows.h> #include "mem.h" |