aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMashiat Sarker Shakkhar <shahriman_ams@yahoo.com>2011-12-02 02:58:00 +0600
committerMashiat Sarker Shakkhar <shahriman_ams@yahoo.com>2011-12-02 03:09:19 +0600
commit768261e50d70fd8129b0f1672a48451344a220e9 (patch)
treecd5962c80ed8712431cecb510e494ceceec185e7 /libavcodec
parent8aa831c07b47c4f384919cd38930ac64ce04b05b (diff)
downloadffmpeg-768261e50d70fd8129b0f1672a48451344a220e9.tar.gz
Fix some int / int16_t / int32_t confusion
For now force everything to int16_t, except for variables used as index
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wmalosslessdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 795fcaed47..3b3ff0f749 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -875,7 +875,8 @@ static void revert_mclms(WmallDecodeCtx *s, int tile_size)
static int lms_predict(WmallDecodeCtx *s, int ich, int ilms)
{
- int16_t pred = 0, icoef;
+ int16_t pred = 0;
+ int icoef;
int recent = s->cdlms[ich][ilms].recent;
for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++)
@@ -890,7 +891,7 @@ static int lms_predict(WmallDecodeCtx *s, int ich, int ilms)
return pred;
}
-static void lms_update(WmallDecodeCtx *s, int ich, int ilms, int32_t input, int32_t pred)
+static void lms_update(WmallDecodeCtx *s, int ich, int ilms, int16_t input, int16_t pred)
{
int16_t icoef;
int recent = s->cdlms[ich][ilms].recent;