git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a number of incorrect intmath.h #includes.
[ffmpeg.git]
/
libavcodec
/
arm
/
dca.h
diff --git
a/libavcodec/arm/dca.h
b/libavcodec/arm/dca.h
index
9b0efc0
..
3e55e43
100644
(file)
--- a/
libavcodec/arm/dca.h
+++ b/
libavcodec/arm/dca.h
@@
-22,10
+22,11
@@
#define AVCODEC_ARM_DCA_H
#include <stdint.h>
#define AVCODEC_ARM_DCA_H
#include <stdint.h>
+
#include "config.h"
#include "config.h"
-#include "libav
util/intmath
.h"
+#include "libav
codec/mathops
.h"
-#if HAVE_ARMV6
&& HAVE_INLINE_ASM
&& AV_GCC_VERSION_AT_LEAST(4,4)
+#if HAVE_ARMV6
_INLINE
&& AV_GCC_VERSION_AT_LEAST(4,4)
#define decode_blockcodes decode_blockcodes
static inline int decode_blockcodes(int code1, int code2, int levels,
#define decode_blockcodes decode_blockcodes
static inline int decode_blockcodes(int code1, int code2, int levels,
@@
-79,7
+80,7
@@
static inline int decode_blockcodes(int code1, int code2, int levels,
#endif
#endif
-#if HAVE_NEON
&& HAVE_INLINE_ASM
&& HAVE_ASM_MOD_Y
+#if HAVE_NEON
_INLINE
&& HAVE_ASM_MOD_Y
#define int8x8_fmul_int32 int8x8_fmul_int32
static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale)
#define int8x8_fmul_int32 int8x8_fmul_int32
static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale)