|
|
| @@ -1,10 +1,9 @@
---- libavcodec/wmadec.c.orig 2008-07-21 12:24:00.000000000 +0200
-+++ libavcodec/wmadec.c 2008-06-15 21:30:33.000000000 +0200
-@@ -401,14 +401,13 @@
- s->channel_coded[ch] = a;
+--- libavcodec/wmadec.c.orig 2008-08-12 21:38:07.000000000 +0200
++++ libavcodec/wmadec.c 2008-08-15 16:56:01.000000000 +0200
+@@ -403,13 +403,13 @@
v |= a;
}
--
+
- bsize = s->frame_len_bits - s->block_len_bits;
-
/* if no channel coded, no need to go further */
@@ -17,26 +16,24 @@
/* read total gain and extract corresponding number of bits for
coef escape coding */
total_gain = 1;
-@@ -680,29 +679,27 @@
+@@ -681,28 +681,27 @@
}
}
-next:
for(ch = 0; ch < s->nb_channels; ch++) {
- int n4, index, n;
-+ if (s->channel_coded[ch]) {
-+ int n4, index, n;
- n = s->block_len;
- n4 = s->block_len / 2;
-- if(s->channel_coded[ch]){
+ if(s->channel_coded[ch]){
++ int n4, index, n;
+ n = s->block_len;
+ n4 = s->block_len / 2;
- s->mdct_ctx[bsize].fft.imdct_calc(&s->mdct_ctx[bsize],
-- s->output, s->coefs[ch], s->mdct_tmp);
+ ff_imdct_calc(&s->mdct_ctx[bsize], s->output, s->coefs[ch]);
- }else
- memset(s->output, 0, sizeof(s->output));
--
+
- /* multiply by the window and add in the frame */
- index = (s->frame_len / 2) + s->block_pos - n4;
- wma_window(s, &s->frame_out[ch][index]);
@@ -45,8 +42,6 @@
- channel if it is not coded */
- if (s->ms_stereo && !s->channel_coded[1]) {
- wma_window(s, &s->frame_out[1][index]);
-+ s->output, s->coefs[ch], s->mdct_tmp);
-+
+ /* multiply by the window and add in the frame */
+ index = (s->frame_len / 2) + s->block_pos - n4;
+ wma_window(s, &s->frame_out[ch][index]);
@@ -58,12 +53,12 @@
+ }
}
}
--
-+ next:
+
++next:
/* update block number */
s->block_num++;
s->block_pos += s->block_len;
-@@ -784,11 +781,6 @@
+@@ -784,11 +783,6 @@
skip_bits(&s->gb, 4); /* super frame index */
nb_frames = get_bits(&s->gb, 4) - 1;
@@ -75,7 +70,7 @@
bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3);
if (s->last_superframe_len > 0) {
-@@ -844,10 +836,6 @@
+@@ -844,10 +838,6 @@
s->last_superframe_len = len;
memcpy(s->last_superframe, buf + pos, len);
} else {
|
