Mercurial > libavcodec.hg
changeset 6592:1d4e5e8d8012 libavcodec
ILP64 fixes (untested)
| author | michael |
|---|---|
| date | Sun, 13 Apr 2008 16:11:36 +0000 |
| parents | 45bcfc54aa80 |
| children | e47a04d636a7 |
| files | adpcm.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/adpcm.c Sun Apr 13 10:37:30 2008 +0000 +++ b/adpcm.c Sun Apr 13 16:11:36 2008 +0000 @@ -1215,8 +1215,8 @@ src++; for (count2 = 0; count2 < 28; count2++) { - next_left_sample = (((*src & 0xF0) << 24) >> shift_left); - next_right_sample = (((*src & 0x0F) << 28) >> shift_right); + next_left_sample = (int32_t)((*src & 0xF0) << 24) >> shift_left; + next_right_sample = (int32_t)((*src & 0x0F) << 28) >> shift_right; src++; next_left_sample = (next_left_sample + @@ -1289,9 +1289,9 @@ for (count2=0; count2<28; count2++) { if (count2 & 1) - next_sample = ((*srcC++ & 0x0F) << 28) >> shift; + next_sample = (int32_t)((*srcC++ & 0x0F) << 28) >> shift; else - next_sample = ((*srcC & 0xF0) << 24) >> shift; + next_sample = (int32_t)((*srcC & 0xF0) << 24) >> shift; next_sample += (current_sample * coeff1) + (previous_sample * coeff2); @@ -1336,7 +1336,7 @@ s = &samples[m*avctx->channels + channel]; for (n=0; n<4; n++, src++, s+=32*avctx->channels) { for (s2=s, i=0; i<8; i+=4, s2+=avctx->channels) { - int level = ((*src & (0xF0>>i)) << (24+i)) >> shift[n]; + int level = (int32_t)((*src & (0xF0>>i)) << (24+i)) >> shift[n]; int pred = s2[-1*avctx->channels] * coeff[0][n] + s2[-2*avctx->channels] * coeff[1][n]; s2[0] = av_clip_int16((level + pred + 0x80) >> 8);