Commit 76b19a39 authored by Diego Biurrun's avatar Diego Biurrun

Fix a number of incorrect intmath.h #includes.

parent d925cca9
...@@ -22,8 +22,9 @@ ...@@ -22,8 +22,9 @@
#define AVCODEC_ARM_DCA_H #define AVCODEC_ARM_DCA_H
#include <stdint.h> #include <stdint.h>
#include "config.h" #include "config.h"
#include "libavutil/intmath.h" #include "libavcodec/mathops.h"
#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4)
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/intmath.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
...@@ -42,6 +41,7 @@ ...@@ -42,6 +41,7 @@
#include "dcahuff.h" #include "dcahuff.h"
#include "dca.h" #include "dca.h"
#include "dca_parser.h" #include "dca_parser.h"
#include "mathops.h"
#include "synth_filter.h" #include "synth_filter.h"
#include "dcadsp.h" #include "dcadsp.h"
#include "fmtconvert.h" #include "fmtconvert.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#else #else
#include "libavutil/intmath.h" #include "fft.h"
#include "mathops.h" #include "mathops.h"
void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input); void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input);
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*/ */
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/intmath.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
* Rate control for video encoders. * Rate control for video encoders.
*/ */
#include "libavutil/intmath.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "ratecontrol.h" #include "ratecontrol.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment