aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-26 12:56:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-26 12:56:55 +0100
commit9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (patch)
treeaa364f6228cb3d925e35a718e58684fdced69002
parent6fbddc80d63ddbc8974f4b2e286de20def6c201d (diff)
parent76b19a3984359b3be44d4f7e4e69b7b86729a622 (diff)
downloadffmpeg-9b1a0c2ee82f3b99584857db1ea662e2d08aca7f.tar.gz
Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622': Fix a number of incorrect intmath.h #includes. avconv: remove an unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/arm/dca.h3
-rw-r--r--libavcodec/dcadec.c2
-rw-r--r--libavcodec/fft-internal.h2
-rw-r--r--libavcodec/ra144dec.c1
-rw-r--r--libavcodec/ratecontrol.c1
5 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 3b341cf3da..2cfd18a837 100644
--- 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) && !CONFIG_THUMB
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index e2f37328aa..1b955e4e7b 100644
--- 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 61066bb18b..d66731fb48 100644
--- 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 61b182eb8c..f12954b2f7 100644
--- 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 7a89293347..9f2bcb27c2 100644
--- 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"