Browse code

Do not include mathematics.h in avutil.h

Signed-off-by: Mans Rullgard <mans@mansr.com>

Mans Rullgard authored on 2011/06/04 20:58:23
Showing 54 changed files
... ...
@@ -40,6 +40,7 @@
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"
... ...
@@ -25,6 +25,7 @@
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"
... ...
@@ -37,6 +37,7 @@
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"
... ...
@@ -20,6 +20,7 @@
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"
... ...
@@ -30,6 +30,7 @@
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"
... ...
@@ -28,6 +28,7 @@
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"
... ...
@@ -3697,6 +3697,7 @@ AVCodec ff_snow_encoder = {
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;
... ...
@@ -27,6 +27,7 @@
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"
... ...
@@ -18,6 +18,8 @@
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"
... ...
@@ -23,6 +23,7 @@
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 {
... ...
@@ -30,6 +30,7 @@
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",
... ...
@@ -30,6 +30,7 @@
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[] = {
... ...
@@ -32,6 +32,7 @@
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[] = {
... ...
@@ -26,6 +26,7 @@
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
 
... ...
@@ -27,6 +27,7 @@
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[] = {
... ...
@@ -25,6 +25,7 @@
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"
... ...
@@ -22,6 +22,7 @@
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
 
... ...
@@ -23,6 +23,7 @@
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
 
... ...
@@ -27,6 +27,7 @@
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"
... ...
@@ -25,6 +25,7 @@
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"
... ...
@@ -19,6 +19,7 @@
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
 
... ...
@@ -21,6 +21,7 @@
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"
... ...
@@ -21,6 +21,7 @@
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"
... ...
@@ -32,6 +32,7 @@
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 {
... ...
@@ -35,6 +35,7 @@
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 */
... ...
@@ -19,6 +19,7 @@
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"
... ...
@@ -20,6 +20,7 @@
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"
... ...
@@ -29,6 +29,7 @@
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"
... ...
@@ -27,6 +27,7 @@
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"
... ...
@@ -33,6 +33,7 @@
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"
... ...
@@ -22,6 +22,7 @@
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"
... ...
@@ -20,6 +20,7 @@
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"
... ...
@@ -22,6 +22,7 @@
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"
... ...
@@ -46,6 +46,7 @@
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"
... ...
@@ -18,6 +18,8 @@
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"
... ...
@@ -19,6 +19,7 @@
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"
... ...
@@ -24,6 +24,7 @@
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"
... ...
@@ -20,6 +20,7 @@
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"
... ...
@@ -20,6 +20,7 @@
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"
... ...
@@ -34,6 +34,7 @@
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
 
... ...
@@ -19,6 +19,7 @@
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
 
... ...
@@ -23,6 +23,7 @@
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 {
... ...
@@ -19,6 +19,7 @@
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"
... ...
@@ -34,6 +34,7 @@
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
... ...
@@ -19,6 +19,7 @@
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"
... ...
@@ -22,6 +22,7 @@
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
 
... ...
@@ -22,6 +22,7 @@
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"
... ...
@@ -21,6 +21,7 @@
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
 
... ...
@@ -21,6 +21,7 @@
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
 
... ...
@@ -31,6 +31,7 @@
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"
... ...
@@ -22,6 +22,7 @@
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;
... ...
@@ -22,6 +22,8 @@
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"
... ...
@@ -121,7 +121,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
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"
... ...
@@ -25,6 +25,7 @@
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