diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-05-01 10:46:20 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-05-01 10:49:12 +0200 |
| commit | 8f4358888f373e21a47e079ce1ac3fc3a13f82cc (patch) | |
| tree | 405681cfc86f816665490aeb41c0210628149cbc | |
| parent | b286ff69c03e648453fd161f8ff1c4fcce396fa8 (diff) | |
| download | ffmpeg-8f4358888f373e21a47e079ce1ac3fc3a13f82cc.tar.gz | |
avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct
They should really be int16_t.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/lossless_audiodsp.c | 4 | ||||
| -rw-r--r-- | libavcodec/lossless_audiodsp.h | 4 | ||||
| -rw-r--r-- | libavcodec/wmalosslessdec.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/lossless_audiodsp.c b/libavcodec/lossless_audiodsp.c index 55495d00e1..ea0568e64f 100644 --- a/libavcodec/lossless_audiodsp.c +++ b/libavcodec/lossless_audiodsp.c @@ -36,8 +36,8 @@ static int32_t scalarproduct_and_madd_int16_c(int16_t *v1, const int16_t *v2, return res; } -static int32_t scalarproduct_and_madd_int32_c(int32_t *v1, const int32_t *v2, - const int32_t *v3, +static int32_t scalarproduct_and_madd_int32_c(int16_t *v1, const int32_t *v2, + const int16_t *v3, int order, int mul) { int res = 0; diff --git a/libavcodec/lossless_audiodsp.h b/libavcodec/lossless_audiodsp.h index 930fe30c59..eea5d49fa9 100644 --- a/libavcodec/lossless_audiodsp.h +++ b/libavcodec/lossless_audiodsp.h @@ -37,9 +37,9 @@ typedef struct LLAudDSPContext { const int16_t *v3, int len, int mul); - int32_t (*scalarproduct_and_madd_int32)(int32_t *v1 /* align 16 */, + int32_t (*scalarproduct_and_madd_int32)(int16_t *v1 /* align 16 */, const int32_t *v2, - const int32_t *v3, + const int16_t *v3, int len, int mul); } LLAudDSPContext; diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 9d56d9741c..983c10aac4 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -147,9 +147,9 @@ typedef struct WmallDecodeCtx { int scaling; int coefsend; int bitsend; - DECLARE_ALIGNED(16, int32_t, coefs)[MAX_ORDER + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)]; + DECLARE_ALIGNED(16, int16_t, coefs)[MAX_ORDER + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)]; DECLARE_ALIGNED(16, int32_t, lms_prevvalues)[MAX_ORDER * 2 + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)]; - DECLARE_ALIGNED(16, int32_t, lms_updates)[MAX_ORDER * 2 + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)]; + DECLARE_ALIGNED(16, int16_t, lms_updates)[MAX_ORDER * 2 + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)]; int recent; } cdlms[WMALL_MAX_CHANNELS][9]; |