[FFmpeg-cvslog] Fix two more int16_t vs. int confusion
Mashiat Sarker Shakkhar
git at videolan.org
Wed Dec 7 04:57:32 CET 2011
ffmpeg | branch: master | Mashiat Sarker Shakkhar <shahriman_ams at yahoo.com> | Wed Nov 30 22:39:56 2011 +0600| [bf8715719a3ec85010e7f909c0cdafb265f50fea] | committer: Mashiat Sarker Shakkhar
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf8715719a3ec85010e7f909c0cdafb265f50fea
---
libavcodec/wmalosslessdec.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 4be163e..2a0789b 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) {
More information about the ffmpeg-cvslog
mailing list