Do not include mathematics.h in avutil.h

Mans Rullgard committed 15 years ago

Commit 0ebcdf51 parent ee8aecd54 files · +56 −1Browse files

Unified · Split

54 files

ffmpeg.c +1 −0
ffplay.c +1 −0
ffserver.c +1 −0
libavcodec/acelp_pitch_delay.c +1 −0
libavcodec/ituh263dec.c +1 −0
libavcodec/mpegvideo_enc.c +1 −0
libavcodec/snow.c +1 −0
libavcodec/utils.c +1 −0
libavcodec/xsubdec.c +2 −0
libavfilter/vf_aspect.c +1 −0
libavfilter/vf_crop.c +1 −0
libavfilter/vf_overlay.c +1 −0
libavfilter/vf_pad.c +1 −0
libavfilter/vf_scale.c +1 −0
libavfilter/vf_setpts.c +1 −0
libavfilter/vf_settb.c +1 −0
libavfilter/vsrc_color.c +1 −0
libavfilter/vsrc_nullsrc.c +1 −0
libavformat/applehttp.c +1 −0
libavformat/asfdec.c +1 −0
libavformat/assdec.c +1 −0
libavformat/audiointerleave.c +1 −0
libavformat/avidec.c +1 −0
libavformat/dv.c +1 −0
libavformat/dvenc.c +1 −0
libavformat/ffmetadec.c +1 −0
libavformat/gxfenc.c +1 −0
libavformat/matroskaenc.c +1 −0
libavformat/mov.c +1 −0
libavformat/movenc.c +1 −0
libavformat/mp3dec.c +1 −0
libavformat/mpegenc.c +1 −0
libavformat/mpegtsenc.c +1 −0
libavformat/mxfdec.c +1 −0
libavformat/nsvdec.c +2 −0
libavformat/nut.c +1 −0
libavformat/nutdec.c +1 −0
libavformat/nutenc.c +1 −0
libavformat/oggenc.c +1 −0
libavformat/output-example.c +1 −0
libavformat/pcm.c +1 −0
libavformat/r3d.c +1 −0
libavformat/riff.c +1 −0
libavformat/rl2.c +1 −0
libavformat/rtpdec.c +1 −0
libavformat/rtpenc.c +1 −0
libavformat/rtsp.c +1 −0
libavformat/rtspdec.c +1 −0
libavformat/seek.c +1 −0
libavformat/utils.c +1 −0
libavformat/vqf.c +1 −0
libavformat/wav.c +2 −0
libavutil/avutil.h +0 −1
tests/seek_test.c +1 −0

@@ -40,6 +40,7 @@ · 39 unmodified lines
40	40	#include "libavutil/fifo.h"
41	41	#include "libavutil/intreadwrite.h"
42	42	#include "libavutil/dict.h"
	43	+#include "libavutil/mathematics.h"
43	44	#include "libavutil/pixdesc.h"
44	45	#include "libavutil/avstring.h"
45	46	#include "libavutil/libm.h"

ffplay.c+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25	#include <limits.h>
26	26	#include "libavutil/avstring.h"
27	27	#include "libavutil/colorspace.h"
	28	+#include "libavutil/mathematics.h"
28	29	#include "libavutil/pixdesc.h"
29	30	#include "libavutil/imgutils.h"
30	31	#include "libavutil/dict.h"

ffserver.c+1−0

@@ -37,6 +37,7 @@ · 36 unmodified lines
37	37	#include "libavutil/avstring.h"
38	38	#include "libavutil/lfg.h"
39	39	#include "libavutil/dict.h"
	40	+#include "libavutil/mathematics.h"
40	41	#include "libavutil/random_seed.h"
41	42	#include "libavutil/parseutils.h"
42	43	#include "libavutil/opt.h"

libavcodec/acelp_pitch_delay.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	21	*/
22	22
	23	+#include "libavutil/mathematics.h"
23	24	#include "avcodec.h"
24	25	#include "dsputil.h"
25	26	#include "acelp_pitch_delay.h"

libavcodec/ituh263dec.c+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	30	//#define DEBUG
31	31	#include <limits.h>
32	32
	33	+#include "libavutil/mathematics.h"
33	34	#include "dsputil.h"
34	35	#include "avcodec.h"
35	36	#include "mpegvideo.h"

libavcodec/mpegvideo_enc.c+1−0

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	28	*/
29	29
30	30	#include "libavutil/intmath.h"
	31	+#include "libavutil/mathematics.h"
31	32	#include "avcodec.h"
32	33	#include "dsputil.h"
33	34	#include "mpegvideo.h"

libavcodec/snow.c+1−0

@@ -3697,6 +3697,7 @@ AVCodec ff_snow_encoder = { · 3696 unmodified lines
3697	3697	#undef printf
3698	3698
3699	3699	#include "libavutil/lfg.h"
	3700	+#include "libavutil/mathematics.h"
3700	3701
3701	3702	int main(void){
3702	3703	int width=256;

libavcodec/utils.c+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27
28	28	#include "libavutil/avstring.h"
29	29	#include "libavutil/crc.h"
	30	+#include "libavutil/mathematics.h"
30	31	#include "libavutil/pixdesc.h"
31	32	#include "libavutil/audioconvert.h"
32	33	#include "libavutil/imgutils.h"

libavcodec/xsubdec.c+2−0

@@ -18,6 +18,8 @@ · 17 unmodified lines
18	18	* License along with Libav; if not, write to the Free Software
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
	21	+
	22	+#include "libavutil/mathematics.h"
21	23	#include "libavutil/imgutils.h"
22	24	#include "avcodec.h"
23	25	#include "get_bits.h"

libavfilter/vf_aspect.c+1−0

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	23	* aspect ratio modification video filters
24	24	*/
25	25
	26	+#include "libavutil/mathematics.h"
26	27	#include "avfilter.h"
27	28
28	29	typedef struct {

libavfilter/vf_crop.c+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	30	#include "libavutil/avstring.h"
31	31	#include "libavutil/libm.h"
32	32	#include "libavutil/imgutils.h"
	33	+#include "libavutil/mathematics.h"
33	34
34	35	static const char *var_names[] = {
35	36	"E",

libavfilter/vf_overlay.c+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	30	#include "libavutil/avstring.h"
31	31	#include "libavutil/pixdesc.h"
32	32	#include "libavutil/imgutils.h"
	33	+#include "libavutil/mathematics.h"
33	34	#include "internal.h"
34	35
35	36	static const char *var_names[] = {

libavfilter/vf_pad.c+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	32	#include "libavutil/avassert.h"
33	33	#include "libavutil/imgutils.h"
34	34	#include "libavutil/parseutils.h"
	35	+#include "libavutil/mathematics.h"
35	36	#include "drawutils.h"
36	37
37	38	static const char *var_names[] = {

libavfilter/vf_scale.c+1−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	26	#include "avfilter.h"
27	27	#include "libavutil/avstring.h"
28	28	#include "libavutil/eval.h"
	29	+#include "libavutil/mathematics.h"
29	30	#include "libavutil/pixdesc.h"
30	31	#include "libswscale/swscale.h"
31	32

libavfilter/vf_setpts.c+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27	/* #define DEBUG */
28	28
29	29	#include "libavutil/eval.h"
	30	+#include "libavutil/mathematics.h"
30	31	#include "avfilter.h"
31	32
32	33	static const char *var_names[] = {

libavfilter/vf_settb.c+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25
26	26	#include "libavutil/avstring.h"
27	27	#include "libavutil/eval.h"
	28	+#include "libavutil/mathematics.h"
28	29	#include "libavutil/rational.h"
29	30	#include "avfilter.h"
30	31	#include "internal.h"

libavfilter/vsrc_color.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	22	#include "libavutil/pixdesc.h"
23	23	#include "libavutil/colorspace.h"
24	24	#include "libavutil/imgutils.h"
	25	+#include "libavutil/mathematics.h"
25	26	#include "libavutil/parseutils.h"
26	27	#include "drawutils.h"
27	28

libavfilter/vsrc_nullsrc.c+1−0

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	23
24	24	#include "libavutil/avstring.h"
25	25	#include "libavutil/eval.h"
	26	+#include "libavutil/mathematics.h"
26	27	#include "libavutil/parseutils.h"
27	28	#include "avfilter.h"
28	29

libavformat/applehttp.c+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27
28	28	#include "libavutil/avstring.h"
29	29	#include "libavutil/intreadwrite.h"
	30	+#include "libavutil/mathematics.h"
30	31	#include "libavutil/opt.h"
31	32	#include "libavutil/dict.h"
32	33	#include "avformat.h"

libavformat/asfdec.c+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25	#include "libavutil/common.h"
26	26	#include "libavutil/avstring.h"
27	27	#include "libavutil/dict.h"
	28	+#include "libavutil/mathematics.h"
28	29	#include "libavcodec/mpegaudio.h"
29	30	#include "avformat.h"
30	31	#include "avio_internal.h"

libavformat/assdec.c+1−0

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

libavformat/audiointerleave.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	*/
22	22
23	23	#include "libavutil/fifo.h"
	24	+#include "libavutil/mathematics.h"
24	25	#include "avformat.h"
25	26	#include "audiointerleave.h"
26	27	#include "internal.h"

libavformat/avidec.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21
22	22	#include <strings.h>
23	23	#include "libavutil/intreadwrite.h"
	24	+#include "libavutil/mathematics.h"
24	25	#include "libavutil/bswap.h"
25	26	#include "libavutil/dict.h"
26	27	#include "avformat.h"

libavformat/dv.c+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	32	#include "avformat.h"
33	33	#include "libavcodec/dvdata.h"
34	34	#include "libavutil/intreadwrite.h"
	35	+#include "libavutil/mathematics.h"
35	36	#include "dv.h"
36	37
37	38	struct DVDemuxContext {

libavformat/dvenc.c+1−0

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	35	#include "libavcodec/dvdata.h"
36	36	#include "dv.h"
37	37	#include "libavutil/fifo.h"
	38	+#include "libavutil/mathematics.h"
38	39
39	40	struct DVMuxContext {
40	41	const DVprofile* sys; /* current DV profile, e.g.: 525/60, 625/50 */

libavformat/ffmetadec.c+1−0

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

libavformat/gxfenc.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	*/
21	21
22	22	#include "libavutil/intfloat_readwrite.h"
	23	+#include "libavutil/mathematics.h"
23	24	#include "avformat.h"
24	25	#include "gxf.h"
25	26	#include "riff.h"

libavformat/matroskaenc.c+1−0

@@ -29,6 +29,7 @@ · 28 unmodified lines
29	29	#include "libavutil/samplefmt.h"
30	30	#include "libavutil/intreadwrite.h"
31	31	#include "libavutil/intfloat_readwrite.h"
	32	+#include "libavutil/mathematics.h"
32	33	#include "libavutil/random_seed.h"
33	34	#include "libavutil/lfg.h"
34	35	#include "libavutil/dict.h"

libavformat/mov.c+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27
28	28	#include "libavutil/intreadwrite.h"
29	29	#include "libavutil/intfloat_readwrite.h"
	30	+#include "libavutil/mathematics.h"
30	31	#include "libavutil/avstring.h"
31	32	#include "libavutil/dict.h"
32	33	#include "avformat.h"

libavformat/movenc.c+1−0

@@ -33,6 +33,7 @@ · 32 unmodified lines
33	33	#include "internal.h"
34	34	#include "libavutil/avstring.h"
35	35	#include "libavutil/intfloat_readwrite.h"
	36	+#include "libavutil/mathematics.h"
36	37	#include "libavutil/opt.h"
37	38	#include "libavutil/dict.h"
38	39	#include "rtpenc.h"

libavformat/mp3dec.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	22	#include "libavutil/avstring.h"
23	23	#include "libavutil/intreadwrite.h"
24	24	#include "libavutil/dict.h"
	25	+#include "libavutil/mathematics.h"
25	26	#include "avformat.h"
26	27	#include "id3v2.h"
27	28	#include "id3v1.h"

libavformat/mpegenc.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	*/
21	21
22	22	#include "libavutil/fifo.h"
	23	+#include "libavutil/mathematics.h"
23	24	#include "libavcodec/put_bits.h"
24	25	#include "avformat.h"
25	26	#include "mpeg.h"

libavformat/mpegtsenc.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	22	#include "libavutil/bswap.h"
23	23	#include "libavutil/crc.h"
24	24	#include "libavutil/dict.h"
	25	+#include "libavutil/mathematics.h"
25	26	#include "libavutil/opt.h"
26	27	#include "libavcodec/mpegvideo.h"
27	28	#include "avformat.h"

libavformat/mxfdec.c+1−0

@@ -46,6 +46,7 @@ · 45 unmodified lines
46	46	//#define DEBUG
47	47
48	48	#include "libavutil/aes.h"
	49	+#include "libavutil/mathematics.h"
49	50	#include "libavcodec/bytestream.h"
50	51	#include "avformat.h"
51	52	#include "mxf.h"

libavformat/nsvdec.c+2−0

@@ -18,6 +18,8 @@ · 17 unmodified lines
18	18	* License along with Libav; if not, write to the Free Software
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
	21	+
	22	+#include "libavutil/mathematics.h"
21	23	#include "avformat.h"
22	24	#include "riff.h"
23	25	#include "libavutil/dict.h"

libavformat/nut.c+1−0

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

libavformat/nutdec.c+1−0

@@ -24,6 +24,7 @@ · 23 unmodified lines
24	24	#include "libavutil/avstring.h"
25	25	#include "libavutil/bswap.h"
26	26	#include "libavutil/dict.h"
	27	+#include "libavutil/mathematics.h"
27	28	#include "libavutil/tree.h"
28	29	#include "avio_internal.h"
29	30	#include "nut.h"

libavformat/nutenc.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	*/
21	21
22	22	#include "libavutil/intreadwrite.h"
	23	+#include "libavutil/mathematics.h"
23	24	#include "libavutil/tree.h"
24	25	#include "libavutil/dict.h"
25	26	#include "libavcodec/mpegaudiodata.h"

libavformat/oggenc.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	*/
21	21
22	22	#include "libavutil/crc.h"
	23	+#include "libavutil/mathematics.h"
23	24	#include "libavutil/random_seed.h"
24	25	#include "libavcodec/xiph.h"
25	26	#include "libavcodec/bytestream.h"

libavformat/output-example.c+1−0

@@ -34,6 +34,7 @@ · 33 unmodified lines
34	34	#include <string.h>
35	35	#include <math.h>
36	36
	37	+#include "libavutil/mathematics.h"
37	38	#include "libavformat/avformat.h"
38	39	#include "libswscale/swscale.h"
39	40

libavformat/pcm.c+1−0

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

libavformat/r3d.c+1−0

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	23
24	24	#include "libavutil/intreadwrite.h"
25	25	#include "libavutil/dict.h"
	26	+#include "libavutil/mathematics.h"
26	27	#include "avformat.h"
27	28
28	29	typedef struct {

libavformat/riff.c+1−0

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

libavformat/rl2.c+1−0

@@ -34,6 +34,7 @@ · 33 unmodified lines
34	34	*/
35	35
36	36	#include "libavutil/intreadwrite.h"
	37	+#include "libavutil/mathematics.h"
37	38	#include "avformat.h"
38	39
39	40	#define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr, palette

libavformat/rtpdec.c+1−0

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

libavformat/rtpenc.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	22	#include "avformat.h"
23	23	#include "mpegts.h"
24	24	#include "internal.h"
	25	+#include "libavutil/mathematics.h"
25	26	#include "libavutil/random_seed.h"
26	27	#include "libavutil/opt.h"
27	28

libavformat/rtsp.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	22	#include "libavutil/base64.h"
23	23	#include "libavutil/avstring.h"
24	24	#include "libavutil/intreadwrite.h"
	25	+#include "libavutil/mathematics.h"
25	26	#include "libavutil/parseutils.h"
26	27	#include "libavutil/random_seed.h"
27	28	#include "libavutil/dict.h"

libavformat/rtspdec.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21
22	22	#include "libavutil/avstring.h"
23	23	#include "libavutil/intreadwrite.h"
	24	+#include "libavutil/mathematics.h"
24	25	#include "libavutil/opt.h"
25	26	#include "avformat.h"
26	27

libavformat/seek.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21	*/
22	22
23	23	#include "seek.h"
	24	+#include "libavutil/mathematics.h"
24	25	#include "libavutil/mem.h"
25	26	#include "internal.h"
26	27

libavformat/utils.c+1−0

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	31	#include "metadata.h"
32	32	#include "id3v2.h"
33	33	#include "libavutil/avstring.h"
	34	+#include "libavutil/mathematics.h"
34	35	#include "riff.h"
35	36	#include "audiointerleave.h"
36	37	#include "url.h"

libavformat/vqf.c+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	22	#include "avformat.h"
23	23	#include "libavutil/intreadwrite.h"
24	24	#include "libavutil/dict.h"
	25	+#include "libavutil/mathematics.h"
25	26
26	27	typedef struct VqfContext {
27	28	int frame_bit_len;

libavformat/wav.c+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	* License along with Libav; if not, write to the Free Software
23	23	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
24	24	*/
	25	+
	26	+#include "libavutil/mathematics.h"
25	27	#include "avformat.h"
26	28	#include "avio_internal.h"
27	29	#include "pcm.h"

libavutil/avutil.h+0−1

@@ -121,7 +121,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type); · 120 unmodified lines
121	121
122	122	#include "common.h"
123	123	#include "error.h"
124		−#include "mathematics.h"
125	124	#include "rational.h"
126	125	#include "log.h"
127	126	#include "pixfmt.h"

tests/seek_test.c+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25	#include <string.h>
26	26
27	27	#include "libavutil/common.h"
	28	+#include "libavutil/mathematics.h"
28	29	#include "libavformat/avformat.h"
29	30
30	31	#undef exit

Do not include mathematics.h in avutil.h

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code