Browse Source

Fix a number of incorrect intmath.h #includes.

tags/n1.2
Diego Biurrun 12 years ago
parent
commit
76b19a3984
5 changed files with 4 additions and 5 deletions
  1. +2
    -1
      libavcodec/arm/dca.h
  2. +1
    -1
      libavcodec/dcadec.c
  3. +1
    -1
      libavcodec/fft-internal.h
  4. +0
    -1
      libavcodec/ra144dec.c
  5. +0
    -1
      libavcodec/ratecontrol.c

+ 2
- 1
libavcodec/arm/dca.h View File

@@ -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)




+ 1
- 1
libavcodec/dcadec.c View File

@@ -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 @@
#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"


+ 1
- 1
libavcodec/fft-internal.h View File

@@ -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);


+ 0
- 1
libavcodec/ra144dec.c View File

@@ -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"


+ 0
- 1
libavcodec/ratecontrol.c View File

@@ -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"


Loading…
Cancel
Save