diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2012-12-27 22:33:51 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-07-17 11:02:47 +0300 |
| commit | b6293e2798afab60596a87010b6163fcb4ca3086 (patch) | |
| tree | 256cc1560b131fd9d125ef8858f25d91d58d78ad /libavcodec/arm | |
| parent | 50612484e058e8b241f0528584d64d9d2ccebf12 (diff) | |
fmtconvert: Explicitly use int32_t instead of int
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dca.h | 4 | ||||
| -rw-r--r-- | libavcodec/arm/fmtconvert_init_arm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h index 3e55e433c2..39ec2b6bc8 100644 --- a/libavcodec/arm/dca.h +++ b/libavcodec/arm/dca.h @@ -30,9 +30,9 @@ #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" diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index c5f8fbfee3..4f36729b00 100644 --- a/libavcodec/arm/fmtconvert_init_arm.c +++ b/libavcodec/arm/fmtconvert_init_arm.c @@ -25,7 +25,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" -void ff_int32_to_float_fmul_scalar_neon(float *dst, const int *src, +void ff_int32_to_float_fmul_scalar_neon(float *dst, const int32_t *src, float mul, int len); void ff_float_to_int16_neon(int16_t *dst, const float *src, long len); |