[FFmpeg-cvslog] Fix some int / int16_t / int32_t confusion
Mashiat Sarker Shakkhar
git at videolan.org
Wed Dec 7 04:57:33 CET 2011
ffmpeg | branch: master | Mashiat Sarker Shakkhar <shahriman_ams at yahoo.com> | Fri Dec 2 02:58:00 2011 +0600| [768261e50d70fd8129b0f1672a48451344a220e9] | committer: Mashiat Sarker Shakkhar
Fix some int / int16_t / int32_t confusion
For now force everything to int16_t, except
for variables used as index
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=768261e50d70fd8129b0f1672a48451344a220e9
---
libavcodec/wmalosslessdec.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 795fcae..3b3ff0f 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;
More information about the ffmpeg-cvslog
mailing list