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/dcadec.c | |
| parent | d13fa0e995edc8a92359799ae6a9124d3a89306b (diff) | |
| download | ffmpeg-f49564c6075935443323abf4571a62205e7b3c59.tar.gz | |
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/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 384a192da7..aa583742f5 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1257,7 +1257,7 @@ static void dca_downmix(float **samples, int srcfmt, #ifndef decode_blockcodes /* Very compact version of the block code decoder that does not use table * look-up but is slightly slower */ -static int decode_blockcode(int code, int levels, int *values) +static int decode_blockcode(int code, int levels, int32_t *values) { int i; int offset = (levels - 1) >> 1; @@ -1271,7 +1271,7 @@ static int decode_blockcode(int code, int levels, int *values) return code; } -static int decode_blockcodes(int code1, int code2, int levels, int *values) +static int decode_blockcodes(int code1, int code2, int levels, int32_t *values) { return decode_blockcode(code1, levels, values) | decode_blockcode(code2, levels, values + 4); @@ -1300,7 +1300,7 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index) /* FIXME */ float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index]; - LOCAL_ALIGNED_16(int, block, [8]); + LOCAL_ALIGNED_16(int32_t, block, [8]); /* * Audio data |