virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ILP64 fixes (untested)

Browse Source 
Originally committed as revision 12807 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-04-13 16:11:36 +00:00
parent 7ce76ee433
commit 8c2a4ddca3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/adpcm.c
View File

@ -1215,8 +1215,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
src++; src++;
for (count2 = 0; count2 < 28; count2++) { for (count2 = 0; count2 < 28; count2++) {
next_left_sample = (((*src & 0xF0) << 24) >> shift_left); next_left_sample = (int32_t)((*src & 0xF0) << 24) >> shift_left;
next_right_sample = (((*src & 0x0F) << 28) >> shift_right); next_right_sample = (int32_t)((*src & 0x0F) << 28) >> shift_right;
src++; src++;
next_left_sample = (next_left_sample + next_left_sample = (next_left_sample +
@ -1289,9 +1289,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
for (count2=0; count2<28; count2++) { for (count2=0; count2<28; count2++) {
if (count2 & 1) if (count2 & 1)
next_sample = ((*srcC++ & 0x0F) << 28) >> shift; next_sample = (int32_t)((*srcC++ & 0x0F) << 28) >> shift;
else else
next_sample = ((*srcC & 0xF0) << 24) >> shift; next_sample = (int32_t)((*srcC & 0xF0) << 24) >> shift;
next_sample += (current_sample * coeff1) + next_sample += (current_sample * coeff1) +
(previous_sample * coeff2); (previous_sample * coeff2);
@ -1336,7 +1336,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
s = &samples[m*avctx->channels + channel]; s = &samples[m*avctx->channels + channel];
for (n=0; n<4; n++, src++, s+=32*avctx->channels) { for (n=0; n<4; n++, src++, s+=32*avctx->channels) {
for (s2=s, i=0; i<8; i+=4, s2+=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] int pred = s2[-1*avctx->channels] * coeff[0][n]
+ s2[-2*avctx->channels] * coeff[1][n]; + s2[-2*avctx->channels] * coeff[1][n];
s2[0] = av_clip_int16((level + pred + 0x80) >> 8); s2[0] = av_clip_int16((level + pred + 0x80) >> 8);