diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/arm/mathops.h | 12 | ||||
| -rw-r--r-- | libavcodec/mathops.h | 13 | ||||
| -rw-r--r-- | libavcodec/mpc.h | 3 | ||||
| -rw-r--r-- | libavcodec/mpc8.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpcdata.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodectab.h | 2 | ||||
| -rw-r--r-- | libavcodec/put_bits.h | 1 | ||||
| -rw-r--r-- | libavcodec/tableprint.h | 2 |
9 files changed, 13 insertions, 26 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fa05d03758..768bbde494 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -666,7 +666,8 @@ OBJS-$(!CONFIG_SMALL) += inverse.o -include $(SUBDIR)$(ARCH)/Makefile -SKIPHEADERS = %_tablegen.h +SKIPHEADERS += %_tablegen.h aac_tablegen_decl.h \ + fft-internal.h $(ARCH)/vp56_arith.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index 26404772bc..db427b59b4 100644 --- a/libavcodec/arm/mathops.h +++ b/libavcodec/arm/mathops.h @@ -28,18 +28,6 @@ #if HAVE_INLINE_ASM -# define MULL MULL -static inline av_const int MULL(int a, int b, unsigned shift) -{ - int lo, hi; - __asm__("smull %0, %1, %2, %3 \n\t" - "mov %0, %0, lsr %4 \n\t" - "add %1, %0, %1, lsl %5 \n\t" - : "=&r"(lo), "=&r"(hi) - : "r"(b), "r"(a), "ir"(shift), "ir"(32-shift)); - return hi; -} - #define MULH MULH #define MUL64 MUL64 diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 29b3cd0acb..0477cfdce3 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -23,6 +23,7 @@ #define AVCODEC_MATHOPS_H #include "libavutil/common.h" +#include "config.h" #if ARCH_ARM # include "arm/mathops.h" @@ -40,13 +41,17 @@ /* generic implementation */ +#ifndef MUL64 +# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b)) +#endif + #ifndef MULL -# define MULL(a,b,s) (((int64_t)(a) * (int64_t)(b)) >> (s)) +# define MULL(a,b,s) (MUL64(a, b) >> (s)) #endif #ifndef MULH static av_always_inline int MULH(int a, int b){ - return ((int64_t)(a) * (int64_t)(b))>>32; + return MUL64(a, b) >> 32; } #endif @@ -56,10 +61,6 @@ static av_always_inline unsigned UMULH(unsigned a, unsigned b){ } #endif -#ifndef MUL64 -# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b)) -#endif - #ifndef MAC64 # define MAC64(d, a, b) ((d) += MUL64(a, b)) #endif diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index 365580ebd0..cd5769234c 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -34,8 +34,7 @@ #include "get_bits.h" #include "dsputil.h" #include "mpegaudio.h" - -#include "mpcdata.h" +#include "mpegaudiodsp.h" #define BANDS 32 #define SAMPLES_PER_BAND 36 diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 51c5509425..2864b1a010 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -33,7 +33,6 @@ #include "libavutil/audioconvert.h" #include "mpc.h" -#include "mpcdata.h" #include "mpc8data.h" #include "mpc8huff.h" diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h index a2212ecb25..03df3da3b5 100644 --- a/libavcodec/mpcdata.h +++ b/libavcodec/mpcdata.h @@ -22,8 +22,6 @@ #ifndef AVCODEC_MPCDATA_H #define AVCODEC_MPCDATA_H -#include <stdint.h> - static const float mpc_CC[18] = { 65536.0000, 21845.3333, 13107.2000, 9362.2857, 7281.7778, 4369.0667, 2114.0645, 1040.2539, 516.0315, 257.0039, 128.2505, 64.0626, 32.0156, 16.0039, 8.0010, diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h index 4dd8a7cfc9..accd12b8e2 100644 --- a/libavcodec/mpegaudiodectab.h +++ b/libavcodec/mpegaudiodectab.h @@ -27,7 +27,9 @@ #ifndef AVCODEC_MPEGAUDIODECTAB_H #define AVCODEC_MPEGAUDIODECTAB_H +#include <stddef.h> #include <stdint.h> + #include "mpegaudio.h" /*******************************************************/ diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index d301d0afcc..79016912d5 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -34,6 +34,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "mathops.h" +#include "config.h" //#define ALT_BITSTREAM_WRITER //#define ALIGNED_BITSTREAM_WRITER diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h index d81b9a387b..cf7c1914e0 100644 --- a/libavcodec/tableprint.h +++ b/libavcodec/tableprint.h @@ -26,8 +26,6 @@ #include <inttypes.h> #include <stdio.h> -#include "libavutil/common.h" - #define WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, ...)\ void write_##type##_array(const type *data, int len)\ {\ |