diff options
author | Mans Rullgard <mans@mansr.com> | 2011-06-04 12:58:23 +0100 |
---|---|---|
committer | Mans Rullgard <mans@mansr.com> | 2011-07-03 21:42:06 +0100 |
commit | 0ebcdf5cdad6bf20a5170735a7f77b23ecc081ac (patch) | |
tree | 2be5df93399cf1381764528b6cc8a0472c77745e | |
parent | ee8aecd23a962914d7c264c2169eed8b69d031aa (diff) | |
download | ffmpeg-streaming-0ebcdf5cdad6bf20a5170735a7f77b23ecc081ac.zip ffmpeg-streaming-0ebcdf5cdad6bf20a5170735a7f77b23ecc081ac.tar.gz |
Do not include mathematics.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
54 files changed, 56 insertions, 1 deletions
@@ -40,6 +40,7 @@ #include "libavutil/fifo.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" #include "libavutil/libm.h" @@ -25,6 +25,7 @@ #include <limits.h> #include "libavutil/avstring.h" #include "libavutil/colorspace.h" +#include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" #include "libavutil/dict.h" @@ -37,6 +37,7 @@ #include "libavutil/avstring.h" #include "libavutil/lfg.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "libavutil/random_seed.h" #include "libavutil/parseutils.h" #include "libavutil/opt.h" diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index 4e44bc9..2b791b5 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "avcodec.h" #include "dsputil.h" #include "acelp_pitch_delay.h" diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 0bb92da..7071b84 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -30,6 +30,7 @@ //#define DEBUG #include <limits.h> +#include "libavutil/mathematics.h" #include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index cd13a5c..73bcc5b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -28,6 +28,7 @@ */ #include "libavutil/intmath.h" +#include "libavutil/mathematics.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 4ab029d..6a63da7 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -3697,6 +3697,7 @@ AVCodec ff_snow_encoder = { #undef printf #include "libavutil/lfg.h" +#include "libavutil/mathematics.h" int main(void){ int width=256; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 44a6f8c..722f758 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -27,6 +27,7 @@ #include "libavutil/avstring.h" #include "libavutil/crc.h" +#include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" #include "libavutil/audioconvert.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 097cbc6..4afefac 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -18,6 +18,8 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/mathematics.h" #include "libavutil/imgutils.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 2ede0fd..b43aa86 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -23,6 +23,7 @@ * aspect ratio modification video filters */ +#include "libavutil/mathematics.h" #include "avfilter.h" typedef struct { diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 69e5a52..0880d4e 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -30,6 +30,7 @@ #include "libavutil/avstring.h" #include "libavutil/libm.h" #include "libavutil/imgutils.h" +#include "libavutil/mathematics.h" static const char *var_names[] = { "E", diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index c8bdf51..39b2375 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -30,6 +30,7 @@ #include "libavutil/avstring.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" +#include "libavutil/mathematics.h" #include "internal.h" static const char *var_names[] = { diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 18873b8..851172c 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -32,6 +32,7 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/parseutils.h" +#include "libavutil/mathematics.h" #include "drawutils.h" static const char *var_names[] = { diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 65fe01c..9ec686f 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -26,6 +26,7 @@ #include "avfilter.h" #include "libavutil/avstring.h" #include "libavutil/eval.h" +#include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" #include "libswscale/swscale.h" diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c index bece373..f265092 100644 --- a/libavfilter/vf_setpts.c +++ b/libavfilter/vf_setpts.c @@ -27,6 +27,7 @@ /* #define DEBUG */ #include "libavutil/eval.h" +#include "libavutil/mathematics.h" #include "avfilter.h" static const char *var_names[] = { diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c index 9575483..eeb4353 100644 --- a/libavfilter/vf_settb.c +++ b/libavfilter/vf_settb.c @@ -25,6 +25,7 @@ #include "libavutil/avstring.h" #include "libavutil/eval.h" +#include "libavutil/mathematics.h" #include "libavutil/rational.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c index 6d41c8a..0fb08d7 100644 --- a/libavfilter/vsrc_color.c +++ b/libavfilter/vsrc_color.c @@ -22,6 +22,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/colorspace.h" #include "libavutil/imgutils.h" +#include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "drawutils.h" diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c index 629de78..dfd56fa 100644 --- a/libavfilter/vsrc_nullsrc.c +++ b/libavfilter/vsrc_nullsrc.c @@ -23,6 +23,7 @@ #include "libavutil/avstring.h" #include "libavutil/eval.h" +#include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "avfilter.h" diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 38f33a2..7e0c930 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -27,6 +27,7 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/dict.h" #include "avformat.h" diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 38fe4f9..ac559a0 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -25,6 +25,7 @@ #include "libavutil/common.h" #include "libavutil/avstring.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "libavcodec/mpegaudio.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/assdec.c b/libavformat/assdec.c index b270200..08b520e 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index e4cb1b8..e48f826 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -21,6 +21,7 @@ */ #include "libavutil/fifo.h" +#include "libavutil/mathematics.h" #include "avformat.h" #include "audiointerleave.h" #include "internal.h" diff --git a/libavformat/avidec.c b/libavformat/avidec.c index a00b9ce..2ea156e 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -21,6 +21,7 @@ #include <strings.h> #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/bswap.h" #include "libavutil/dict.h" #include "avformat.h" diff --git a/libavformat/dv.c b/libavformat/dv.c index 4b41e0a..f38b954 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -32,6 +32,7 @@ #include "avformat.h" #include "libavcodec/dvdata.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "dv.h" struct DVDemuxContext { diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 537581a..504e3ee 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -35,6 +35,7 @@ #include "libavcodec/dvdata.h" #include "dv.h" #include "libavutil/fifo.h" +#include "libavutil/mathematics.h" struct DVMuxContext { const DVprofile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index e3d800d..73d3b83 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "avformat.h" #include "ffmeta.h" #include "internal.h" diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index ac88475..5a3ff39 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -20,6 +20,7 @@ */ #include "libavutil/intfloat_readwrite.h" +#include "libavutil/mathematics.h" #include "avformat.h" #include "gxf.h" #include "riff.h" diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 34c65d0..d132b65 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -29,6 +29,7 @@ #include "libavutil/samplefmt.h" #include "libavutil/intreadwrite.h" #include "libavutil/intfloat_readwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/random_seed.h" #include "libavutil/lfg.h" #include "libavutil/dict.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index f0b87dd..acde35d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -27,6 +27,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/intfloat_readwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/avstring.h" #include "libavutil/dict.h" #include "avformat.h" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2e2f869..0de7c4d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -33,6 +33,7 @@ #include "internal.h" #include "libavutil/avstring.h" #include "libavutil/intfloat_readwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/dict.h" #include "rtpenc.h" diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index a1db232..70ced02 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -22,6 +22,7 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "avformat.h" #include "id3v2.h" #include "id3v1.h" diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 820c5bd..5859254 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -20,6 +20,7 @@ */ #include "libavutil/fifo.h" +#include "libavutil/mathematics.h" #include "libavcodec/put_bits.h" #include "avformat.h" #include "mpeg.h" diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 26d2cb2..83ede1d 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -22,6 +22,7 @@ #include "libavutil/bswap.h" #include "libavutil/crc.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavcodec/mpegvideo.h" #include "avformat.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 82daa2a..cf2bb6c 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -46,6 +46,7 @@ //#define DEBUG #include "libavutil/aes.h" +#include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" #include "avformat.h" #include "mxf.h" diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 6e9cfe3..4787331 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -18,6 +18,8 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/mathematics.h" #include "avformat.h" #include "riff.h" #include "libavutil/dict.h" diff --git a/libavformat/nut.c b/libavformat/nut.c index 9a2ee6b..1ce048d 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "libavutil/tree.h" #include "nut.h" #include "internal.h" diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index db1b999..93888a2 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -24,6 +24,7 @@ #include "libavutil/avstring.h" #include "libavutil/bswap.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "libavutil/tree.h" #include "avio_internal.h" #include "nut.h" diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 260a760..412c670 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -20,6 +20,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/tree.h" #include "libavutil/dict.h" #include "libavcodec/mpegaudiodata.h" diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index bc4b3c1..2b2189c 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -20,6 +20,7 @@ */ #include "libavutil/crc.h" +#include "libavutil/mathematics.h" #include "libavutil/random_seed.h" #include "libavcodec/xiph.h" #include "libavcodec/bytestream.h" diff --git a/libavformat/output-example.c b/libavformat/output-example.c index 4453c03..3b28b7c 100644 --- a/libavformat/output-example.c +++ b/libavformat/output-example.c @@ -34,6 +34,7 @@ #include <string.h> #include <math.h> +#include "libavutil/mathematics.h" #include "libavformat/avformat.h" #include "libswscale/swscale.h" diff --git a/libavformat/pcm.c b/libavformat/pcm.c index 26ab142..7d5fed5 100644 --- a/libavformat/pcm.c +++ b/libavformat/pcm.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "avformat.h" #include "pcm.h" diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 619c6a7..5dd7f997 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -23,6 +23,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "avformat.h" typedef struct { diff --git a/libavformat/riff.c b/libavformat/riff.c index 817349c..27f45b9 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "libavcodec/avcodec.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/rl2.c b/libavformat/rl2.c index b4172c2..12cb391 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -34,6 +34,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "avformat.h" #define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr, palette diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index a910cf0..2c262d9 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "libavcodec/get_bits.h" #include "avformat.h" #include "mpegts.h" diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 3da6dfb..c412158 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -22,6 +22,7 @@ #include "avformat.h" #include "mpegts.h" #include "internal.h" +#include "libavutil/mathematics.h" #include "libavutil/random_seed.h" #include "libavutil/opt.h" diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 80cd587..ce9bf1e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -22,6 +22,7 @@ #include "libavutil/base64.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "libavutil/random_seed.h" #include "libavutil/dict.h" diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 9cd9be1..2dff46d 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -21,6 +21,7 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "avformat.h" diff --git a/libavformat/seek.c b/libavformat/seek.c index 71e2f8a..6c4286b 100644 --- a/libavformat/seek.c +++ b/libavformat/seek.c @@ -21,6 +21,7 @@ */ #include "seek.h" +#include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "internal.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index de26a18..060e58e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -31,6 +31,7 @@ #include "metadata.h" #include "id3v2.h" #include "libavutil/avstring.h" +#include "libavutil/mathematics.h" #include "riff.h" #include "audiointerleave.h" #include "url.h" diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 5be7dfe..dd02abd 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -22,6 +22,7 @@ #include "avformat.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" typedef struct VqfContext { int frame_bit_len; diff --git a/libavformat/wav.c b/libavformat/wav.c index 92c9bfc..3914610 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -22,6 +22,8 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/mathematics.h" #include "avformat.h" #include "avio_internal.h" #include "pcm.h" diff --git a/libavutil/avutil.h b/libavutil/avutil.h index b8882a7..53dba00 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -121,7 +121,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type); #include "common.h" #include "error.h" -#include "mathematics.h" #include "rational.h" #include "log.h" #include "pixfmt.h" diff --git a/tests/seek_test.c b/tests/seek_test.c index 5d4f41c..71b2a2d 100644 --- a/tests/seek_test.c +++ b/tests/seek_test.c @@ -25,6 +25,7 @@ #include <string.h> #include "libavutil/common.h" +#include "libavutil/mathematics.h" #include "libavformat/avformat.h" #undef exit |