ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sun May 1 10:46:20 2016 +0200| [8f4358888f373e21a47e079ce1ac3fc3a13f82cc] | committer: Paul B Mahol
avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct They should really be int16_t. Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f4358888f373e21a47e079ce1ac3fc3a13f82cc --- libavcodec/lossless_audiodsp.c | 4 ++-- libavcodec/lossless_audiodsp.h | 4 ++-- libavcodec/wmalosslessdec.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/lossless_audiodsp.c b/libavcodec/lossless_audiodsp.c index 55495d0..ea0568e 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 930fe30..eea5d49 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 9d56d97..983c10a 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]; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
