summaryrefslogtreecommitdiff
path: root/libavcodec/mace.c
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2008-09-07 14:32:10 +0000
committerVitor Sessak <vitor1001@gmail.com>2008-09-07 14:32:10 +0000
commitb1547a7817d09f9da9120d4214e10e8fbc67ac4c (patch)
tree34d829b4e2b80354eb1bd6a0a450ce9becc518cb /libavcodec/mace.c
parentfc1d3e004fda7b2a14a3e104f280f173f7cff562 (diff)
Remove cast, now tables are signed.
Originally committed as revision 15252 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mace.c')
-rw-r--r--libavcodec/mace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index cf79704958..95b995e59e 100644
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -260,12 +260,12 @@ static inline int16_t mace_broken_clip_int16(int n)
static void chomp3(ChannelData *ctx, int16_t *output, uint8_t val,
const uint16_t tab1[],
- const uint16_t *tab2, int tab2_stride,
+ const int16_t *tab2, int tab2_stride,
uint32_t numChannels)
{
short current;
- current = (short)tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val];
+ current = tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val];
current = mace_broken_clip_int16(current + ctx->lev);
@@ -277,12 +277,12 @@ static void chomp3(ChannelData *ctx, int16_t *output, uint8_t val,
static void chomp6(ChannelData *ctx, int16_t *output, uint8_t val,
const uint16_t tab1[],
- const uint16_t *tab2, int tab2_stride,
+ const int16_t *tab2, int tab2_stride,
uint32_t numChannels)
{
short current;
- current = (short)tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val];
+ current = tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val];
if ((ctx->previous ^ current) >= 0) {
ctx->factor = FFMIN(ctx->factor + 506, 32767);