summaryrefslogtreecommitdiff
path: root/libavcodec/wmadec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-28 00:46:09 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-28 00:46:09 +0000
commit29ca668f0a86291a07bf95ee4f782d96f3343278 (patch)
tree9b77a559f24b583a1f016ba4dc98d154949d1db9 /libavcodec/wmadec.c
parent53e6fbb4c503927d4847d9470ca2a2fc91db2590 (diff)
Fix mid/side stereo buggy output zeroing, fixes issue264 part 2.
Originally committed as revision 15004 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wmadec.c')
-rw-r--r--libavcodec/wmadec.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 74b95cd528..fbd945db54 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -689,18 +689,12 @@ next:
n4 = s->block_len / 2;
if(s->channel_coded[ch]){
ff_imdct_calc(&s->mdct_ctx[bsize], s->output, s->coefs[ch]);
- }else
+ }else if(!(s->ms_stereo && ch==1))
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]);
-
- /* specific fast case for ms-stereo : add to second
- channel if it is not coded */
- if (s->ms_stereo && !s->channel_coded[1]) {
- wma_window(s, &s->frame_out[1][index]);
- }
}
/* update block number */