virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Fix apparent 10l typos introduced in r8627.

Browse Source 
These typos moved the exponent pointer too far ahead.
Fixes issue1055.

Originally committed as revision 20756 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-12-06 23:51:51 +00:00
parent 75084e47ff
commit f78501b264
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/wmadec.c
View File

@ -630,7 +630,7 @@ static int wma_decode_block(WMACodecContext *s)
/* compute power of high bands */ /* compute power of high bands */
exponents = s->exponents[ch] + exponents = s->exponents[ch] +
(s->high_band_start[bsize]<<bsize); (s->high_band_start[bsize]<<bsize>>esize);
last_high_band = 0; /* avoid warning */ last_high_band = 0; /* avoid warning */
for(j=0;j<n1;j++) { for(j=0;j<n1;j++) {
n = s->exponent_high_bands[s->frame_len_bits - n = s->exponent_high_bands[s->frame_len_bits -
@ -646,11 +646,11 @@ static int wma_decode_block(WMACodecContext *s)
last_high_band = j; last_high_band = j;
tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n);
} }
exponents += n<<bsize; exponents += n<<bsize>>esize;
} }
/* main freqs and high freqs */ /* main freqs and high freqs */
exponents = s->exponents[ch] + (s->coefs_start<<bsize); exponents = s->exponents[ch] + (s->coefs_start<<bsize>>esize);
for(j=-1;j<n1;j++) { for(j=-1;j<n1;j++) {
if (j < 0) { if (j < 0) {
n = s->high_band_start[bsize] - n = s->high_band_start[bsize] -
@ -672,7 +672,7 @@ static int wma_decode_block(WMACodecContext *s)
*coefs++ = noise * *coefs++ = noise *
exponents[i<<bsize>>esize] * mult1; exponents[i<<bsize>>esize] * mult1;
} }
exponents += n<<bsize; exponents += n<<bsize>>esize;
} else { } else {
/* coded values + small noise */ /* coded values + small noise */
for(i = 0;i < n; i++) { for(i = 0;i < n; i++) {
@ -681,7 +681,7 @@ static int wma_decode_block(WMACodecContext *s)
*coefs++ = ((*coefs1++) + noise) * *coefs++ = ((*coefs1++) + noise) *
exponents[i<<bsize>>esize] * mult; exponents[i<<bsize>>esize] * mult;
} }
exponents += n<<bsize; exponents += n<<bsize>>esize;
} }
} }