diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2012-12-27 22:33:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 18:01:16 +0200 |
| commit | f49564c6075935443323abf4571a62205e7b3c59 (patch) | |
| tree | 02f7360e05c77564a6032803d35187b7cb6b9e5e /libavcodec/arm | |
| parent | d13fa0e995edc8a92359799ae6a9124d3a89306b (diff) | |
| download | android_external_ffmpeg-f49564c6075935443323abf4571a62205e7b3c59.tar.gz android_external_ffmpeg-f49564c6075935443323abf4571a62205e7b3c59.tar.bz2 android_external_ffmpeg-f49564c6075935443323abf4571a62205e7b3c59.zip | |
fmtconvert: int32_t input to int32_to_float_fmul_scalar
It was previously declared as int.
Does not change fate results for x86.
Conflicts:
libavcodec/ppc/fmtconvert_altivec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 431b62e527..af37da863a 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 %0, %6, %10 \n" "smmul %3, %7, %10 \n" diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index 1d99c9720a..8f8a1d603e 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); |