[SCM] libav/experimental: Remove cast, now tables are signed.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:29:42 UTC 2013
The following commit has been merged in the experimental branch:
commit b1547a7817d09f9da9120d4214e10e8fbc67ac4c
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Sun Sep 7 14:32:10 2008 +0000
Remove cast, now tables are signed.
Originally committed as revision 15252 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index cf79704..95b995e 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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list