Fix a number of incorrect intmath.h #includes.

diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 09b6e64baa069ac9d97968417bcb50111a172267..3e55e433c2c68c44c5699e0e39b47553b9bcff3e 100644 (file)
--- a/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@ -22,8 +22,9 @@
 #define AVCODEC_ARM_DCA_H
 
 #include <stdint.h>
+
 #include "config.h"
-#include "libavutil/intmath.h"
+#include "libavcodec/mathops.h"
 
 #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4)
 

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 96f1ee20b204e8662e1bb51f41e9fbe2cc4e042d..efd07055ecd0bb8d37a4f07df8754b4309ba5daf 100644 (file)
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -30,7 +30,6 @@
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/internal.h"
-#include "libavutil/intmath.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/samplefmt.h"
@@ -42,6 +41,7 @@
 #include "dcahuff.h"
 #include "dca.h"
 #include "dca_parser.h"
+#include "mathops.h"
 #include "synth_filter.h"
 #include "dcadsp.h"
 #include "fmtconvert.h"

diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h
index d30571b7339d3bc5d3b289b372a41e5a464a840d..c3126258371514f25ebdd2f7dc249c8a9be1f3f6 100644 (file)
--- a/libavcodec/fft-internal.h
+++ b/libavcodec/fft-internal.h
@@ -36,7 +36,7 @@
 
 #else
 
-#include "libavutil/intmath.h"
+#include "fft.h"
 #include "mathops.h"
 
 void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input);

diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
index ba965d67fedb3ab4b74e6617160dc1f92fb1f59e..d3c81ca6a15ffa3990c64fbc11a9a397b58377ff 100644 (file)
--- a/libavcodec/ra144dec.c
+++ b/libavcodec/ra144dec.c
@@ -23,7 +23,6 @@
  */
 
 #include "libavutil/channel_layout.h"
-#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"

diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index bfa47a97822cdc4fbfc3fb08f76ddd8cee6d0ba8..c3db90d5a761a5e6ba86932c6ed6d172e623e649 100644 (file)
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -25,7 +25,6 @@
  * Rate control for video encoders.
  */
 
-#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "ratecontrol.h"