aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-07-23 17:50:51 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-02-24 12:56:49 +0100
commit84f16bb5e68dc47eca4dc96b3391c58471cd7328 (patch)
treea5c7c84c42ddb3d518183448c63ad30fe7c700e4 /libavutil
parent155cd6baa49797d57f5b42276eeed3f5408ef3f7 (diff)
downloadffmpeg-84f16bb5e68dc47eca4dc96b3391c58471cd7328.tar.gz
avutil/avassert: Don't include avutil.h
Reviewed-by: Martin Storsjö <martin@martin.st> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/avassert.h2
-rw-r--r--libavutil/mathematics.c1
-rw-r--r--libavutil/slicethread.c1
-rw-r--r--libavutil/tests/aes_ctr.c2
-rw-r--r--libavutil/tests/encryption_info.c1
5 files changed, 6 insertions, 1 deletions
diff --git a/libavutil/avassert.h b/libavutil/avassert.h
index 9abeadea4a..51e462bbae 100644
--- a/libavutil/avassert.h
+++ b/libavutil/avassert.h
@@ -28,8 +28,8 @@
#define AVUTIL_AVASSERT_H
#include <stdlib.h>
-#include "avutil.h"
#include "log.h"
+#include "macros.h"
/**
* assert() equivalent, that is always enabled.
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index f4e541fa24..b878317d63 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -26,6 +26,7 @@
#include <stdint.h>
#include <limits.h>
+#include "avutil.h"
#include "mathematics.h"
#include "libavutil/intmath.h"
#include "libavutil/common.h"
diff --git a/libavutil/slicethread.c b/libavutil/slicethread.c
index 867ce32238..ea1c9c8311 100644
--- a/libavutil/slicethread.c
+++ b/libavutil/slicethread.c
@@ -18,6 +18,7 @@
#include <stdatomic.h>
#include "cpu.h"
+#include "internal.h"
#include "slicethread.h"
#include "mem.h"
#include "thread.h"
diff --git a/libavutil/tests/aes_ctr.c b/libavutil/tests/aes_ctr.c
index 9dbf0af8aa..486dae3348 100644
--- a/libavutil/tests/aes_ctr.c
+++ b/libavutil/tests/aes_ctr.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <string.h>
+
#include "libavutil/log.h"
#include "libavutil/mem_internal.h"
#include "libavutil/aes_ctr.h"
diff --git a/libavutil/tests/encryption_info.c b/libavutil/tests/encryption_info.c
index d489612b7d..55c668c6d5 100644
--- a/libavutil/tests/encryption_info.c
+++ b/libavutil/tests/encryption_info.c
@@ -22,6 +22,7 @@
#include <string.h>
#include "libavutil/avassert.h"
+#include "libavutil/mem.h"
static const AVSubsampleEncryptionInfo test_subsamples[] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}};
static const size_t test_subsample_count = sizeof(test_subsamples) / sizeof(test_subsamples[0]);