avutil/avassert: Don't include avutil.h

Andreas Rheinhardt committed 5 years ago

Commit 84f16bb1 parent 155cd6b15 files · +19 −2Browse files

Unified · Split

15 files

libavcodec/dct.c +2 −0
libavcodec/mpegaudiodec_common.c +1 −0
libavcodec/mqcenc.c +2 −0
libavcodec/put_bits.h +1 −0
libavcodec/rdft.c +1 −0
libavcodec/tableprint_vlc.h +1 −1
libavcodec/tests/fft.c +1 −0
libavcodec/x86/mdct15_init.c +2 −0
libavfilter/colorspacedsp.c +1 −0
libavfilter/window_func.h +1 −0
libavutil/avassert.h +1 −1
libavutil/mathematics.c +1 −0
libavutil/slicethread.c +1 −0
libavutil/tests/aes_ctr.c +2 −0
libavutil/tests/encryption_info.c +1 −0

libavcodec/dct.c+2−0

@@ -30,7 +30,9 @@ · 29 unmodified lines
30	#include <math.h>	30	#include <math.h>
31	#include <string.h>	31	#include <string.h>
32		32
		33	#include "libavutil/error.h"
33	#include "libavutil/mathematics.h"	34	#include "libavutil/mathematics.h"
		35	#include "libavutil/mem.h"
34	#include "dct.h"	36	#include "dct.h"
35	#include "dct32.h"	37	#include "dct32.h"
36		38

libavcodec/mpegaudiodec_common.c+1−0

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	#include <stdint.h>	28	#include <stdint.h>
29		29
30	#include "libavutil/avassert.h"	30	#include "libavutil/avassert.h"
		31	#include "libavutil/libm.h"
31	#include "libavutil/thread.h"	32	#include "libavutil/thread.h"
32		33
33	#include "mpegaudiodata.h"	34	#include "mpegaudiodata.h"

libavcodec/mqcenc.c+2−0

@@ -25,6 +25,8 @@ · 24 unmodified lines
25	* @author Kamil Nowosad	25	* @author Kamil Nowosad
26	*/	26	*/
27		27
		28	#include <string.h>
		29
28	#include "libavutil/avassert.h"	30	#include "libavutil/avassert.h"
29	#include "mqc.h"	31	#include "mqc.h"
30		32

libavcodec/put_bits.h+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	#include "config.h"	32	#include "config.h"
33	#include "libavutil/intreadwrite.h"	33	#include "libavutil/intreadwrite.h"
34	#include "libavutil/avassert.h"	34	#include "libavutil/avassert.h"
		35	#include "libavutil/common.h"
35		36
36	#if ARCH_X86_64	37	#if ARCH_X86_64
37	// TODO: Benchmark and optionally enable on other 64-bit architectures.	38	// TODO: Benchmark and optionally enable on other 64-bit architectures.

libavcodec/rdft.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	*/	20	*/
21	#include <stdlib.h>	21	#include <stdlib.h>
22	#include <math.h>	22	#include <math.h>
		23	#include "libavutil/error.h"
23	#include "libavutil/mathematics.h"	24	#include "libavutil/mathematics.h"
24	#include "rdft.h"	25	#include "rdft.h"
25		26

libavcodec/tableprint_vlc.h+1−1

@@ -36,7 +36,7 @@ · 35 unmodified lines
36	#define AVUTIL_INTERNAL_H	36	#define AVUTIL_INTERNAL_H
37	#define avpriv_request_sample(...)	37	#define avpriv_request_sample(...)
38	#include "tableprint.h"	38	#include "tableprint.h"
39	#include "get_bits.h"	39	#include "vlc.h"
40	#include "mathtables.c"	40	#include "mathtables.c"
41	#include "libavutil/reverse.c"	41	#include "libavutil/reverse.c"
42	#include "bitstream.c"	42	#include "bitstream.c"

libavcodec/tests/fft.c+1−0

@@ -38,6 +38,7 @@ · 37 unmodified lines
38	#include <string.h>	38	#include <string.h>
39		39
40	#include "libavutil/cpu.h"	40	#include "libavutil/cpu.h"
		41	#include "libavutil/error.h"
41	#include "libavutil/lfg.h"	42	#include "libavutil/lfg.h"
42	#include "libavutil/log.h"	43	#include "libavutil/log.h"
43	#include "libavutil/mathematics.h"	44	#include "libavutil/mathematics.h"

libavcodec/x86/mdct15_init.c+2−0

@@ -20,6 +20,8 @@ · 19 unmodified lines
20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*/	21	*/
22		22
		23	#include <string.h>
		24
23	#include "config.h"	25	#include "config.h"
24		26
25	#include "libavutil/attributes.h"	27	#include "libavutil/attributes.h"

libavfilter/colorspacedsp.c+1−0

@@ -18,6 +18,7 @@ · 17 unmodified lines
18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19	*/	19	*/
20		20
		21	#include "libavutil/common.h"
21	#include "colorspacedsp.h"	22	#include "colorspacedsp.h"
22		23
23	/*	24	/*

libavfilter/window_func.h+1−0

@@ -24,6 +24,7 @@ · 23 unmodified lines
24		24
25	#include <math.h>	25	#include <math.h>
26	#include "libavutil/avassert.h"	26	#include "libavutil/avassert.h"
		27	#include "libavutil/common.h"
27		28
28	enum WindowFunc { WFUNC_RECT, WFUNC_HANNING, WFUNC_HAMMING, WFUNC_BLACKMAN,	29	enum WindowFunc { WFUNC_RECT, WFUNC_HANNING, WFUNC_HAMMING, WFUNC_BLACKMAN,
29	WFUNC_BARTLETT, WFUNC_WELCH, WFUNC_FLATTOP,	30	WFUNC_BARTLETT, WFUNC_WELCH, WFUNC_FLATTOP,

libavutil/avassert.h+1−1

@@ -28,8 +28,8 @@ · 27 unmodified lines
28	#define AVUTIL_AVASSERT_H	28	#define AVUTIL_AVASSERT_H
29		29
30	#include <stdlib.h>	30	#include <stdlib.h>
31	#include "avutil.h"
32	#include "log.h"	31	#include "log.h"
		32	#include "macros.h"
33		33
34	/**	34	/**
35	* assert() equivalent, that is always enabled.	35	* assert() equivalent, that is always enabled.

libavutil/mathematics.c+1−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	#include <stdint.h>	26	#include <stdint.h>
27	#include <limits.h>	27	#include <limits.h>
28		28
		29	#include "avutil.h"
29	#include "mathematics.h"	30	#include "mathematics.h"
30	#include "libavutil/intmath.h"	31	#include "libavutil/intmath.h"
31	#include "libavutil/common.h"	32	#include "libavutil/common.h"

libavutil/slicethread.c+1−0

@@ -18,6 +18,7 @@ · 17 unmodified lines
18		18
19	#include <stdatomic.h>	19	#include <stdatomic.h>
20	#include "cpu.h"	20	#include "cpu.h"
		21	#include "internal.h"
21	#include "slicethread.h"	22	#include "slicethread.h"
22	#include "mem.h"	23	#include "mem.h"
23	#include "thread.h"	24	#include "thread.h"

libavutil/tests/aes_ctr.c+2−0

@@ -16,6 +16,8 @@ · 15 unmodified lines
16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17	*/	17	*/
18		18
		19	#include <string.h>
		20
19	#include "libavutil/log.h"	21	#include "libavutil/log.h"
20	#include "libavutil/mem_internal.h"	22	#include "libavutil/mem_internal.h"
21	#include "libavutil/aes_ctr.h"	23	#include "libavutil/aes_ctr.h"

libavutil/tests/encryption_info.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	#include <string.h>	22	#include <string.h>
23		23
24	#include "libavutil/avassert.h"	24	#include "libavutil/avassert.h"
		25	#include "libavutil/mem.h"
25		26
26	static const AVSubsampleEncryptionInfo test_subsamples[] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}};	27	static const AVSubsampleEncryptionInfo test_subsamples[] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}};
27	static const size_t test_subsample_count = sizeof(test_subsamples) / sizeof(test_subsamples[0]);	28	static const size_t test_subsample_count = sizeof(test_subsamples) / sizeof(test_subsamples[0]);