avutil/avassert: Don't include avutil.h

Reviewed-by: Martin Storsjö <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>

Author: mkver

libavcodec/dct.c

@@ -30,7 +30,9 @@
 #include <math.h>
 #include <string.h>
 
+#include "libavutil/error.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem.h"
 #include "dct.h"
 #include "dct32.h"
 

libavcodec/mpegaudiodec_common.c

@@ -28,6 +28,7 @@
 #include <stdint.h>
 
 #include "libavutil/avassert.h"
+#include "libavutil/libm.h"
 #include "libavutil/thread.h"
 
 #include "mpegaudiodata.h"

libavcodec/mqcenc.c

@@ -25,6 +25,8 @@
  * @author Kamil Nowosad
  */
 
+#include <string.h>
+
 #include "libavutil/avassert.h"
 #include "mqc.h"
 

libavcodec/put_bits.h

@@ -32,6 +32,7 @@
 #include "config.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avassert.h"
+#include "libavutil/common.h"
 
 #if ARCH_X86_64
 // TODO: Benchmark and optionally enable on other 64-bit architectures.

libavcodec/rdft.c

@@ -20,6 +20,7 @@
  */
 #include <stdlib.h>
 #include <math.h>
+#include "libavutil/error.h"
 #include "libavutil/mathematics.h"
 #include "rdft.h"
 

libavcodec/tableprint_vlc.h

@@ -36,7 +36,7 @@
 #define AVUTIL_INTERNAL_H
 #define avpriv_request_sample(...)
 #include "tableprint.h"
-#include "get_bits.h"
+#include "vlc.h"
 #include "mathtables.c"
 #include "libavutil/reverse.c"
 #include "bitstream.c"

libavcodec/tests/fft.c

@@ -38,6 +38,7 @@
 #include <string.h>
 
 #include "libavutil/cpu.h"
+#include "libavutil/error.h"
 #include "libavutil/lfg.h"
 #include "libavutil/log.h"
 #include "libavutil/mathematics.h"

libavcodec/x86/mdct15_init.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
+
 #include "config.h"
 
 #include "libavutil/attributes.h"

libavfilter/colorspacedsp.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/common.h"
 #include "colorspacedsp.h"
 
 /*

libavfilter/window_func.h

@@ -24,6 +24,7 @@
 
 #include <math.h>
 #include "libavutil/avassert.h"
+#include "libavutil/common.h"
 
 enum WindowFunc     { WFUNC_RECT, WFUNC_HANNING, WFUNC_HAMMING, WFUNC_BLACKMAN,
                       WFUNC_BARTLETT, WFUNC_WELCH, WFUNC_FLATTOP,

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.

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"

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"

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"

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]);