aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMashiat Sarker Shakkhar <shahriman_ams@yahoo.com>2011-11-30 22:39:56 +0600
committerMashiat Sarker Shakkhar <shahriman_ams@yahoo.com>2011-11-30 22:44:45 +0600
commitbf8715719a3ec85010e7f909c0cdafb265f50fea (patch)
treeb7d42ecea1b565e55867ea1f65b53b913b4b5bea /libavcodec
parentbe8a0d26dbeec72b8e254e00724f170c28644c98 (diff)
downloadffmpeg-bf8715719a3ec85010e7f909c0cdafb265f50fea.tar.gz
Fix two more int16_t vs. int confusion
If everything works fine for 16-bit streams, the current code could be extended to do 24-bit.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wmalosslessdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 4be163e20d..2a0789bdf0 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -237,7 +237,7 @@ typedef struct WmallDecodeCtx {
int8_t mclms_scaling;
int16_t mclms_coeffs[128];
int16_t mclms_coeffs_cur[4];
- int mclms_prevvalues[64]; // FIXME: should be 32-bit / 16-bit depending on bit-depth
+ int16_t mclms_prevvalues[64]; // FIXME: should be 32-bit / 16-bit depending on bit-depth
int16_t mclms_updates[64];
int mclms_recent;
@@ -807,7 +807,7 @@ static void lms_update(WmallDecodeCtx *s, int ich, int ilms, int32_t input, int3
{
int16_t icoef;
int recent = s->cdlms[ich][ilms].recent;
- int range = 1 << (s->bits_per_sample - 1);
+ int16_t range = 1 << (s->bits_per_sample - 1);
int bps = s->bits_per_sample > 16 ? 4 : 2; // bytes per sample
if (input > pred) {