arm: Mangle external symbols properly in new vfp assembly files

[ffmpeg] / libavcodec / arm / dca.h

diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 09b6e64baa069ac9d97968417bcb50111a172267..39ec2b6bc8f8819671b3e42ce5d756f64653ba83 100644 (file)
--- a/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@ -22,16 +22,17 @@
 #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)
 
 #define decode_blockcodes decode_blockcodes
 static inline int decode_blockcodes(int code1, int code2, int levels,
-                                    int *values)
+                                    int32_t *values)
 {
-    int v0, v1, v2, v3, v4, v5;
+    int32_t v0, v1, v2, v3, v4, v5;
 
     __asm__ ("smmul   %8,  %14, %18           \n"
              "smmul   %11, %15, %18           \n"