changeset 7712:7c22b99dbf5e libavcodec

Fix mid/side stereo buggy output zeroing, fixes issue264 part 2.
author michael
date Thu, 28 Aug 2008 00:46:09 +0000
parents 06340e09c0ba
children f1e68b2dc389
files wmadec.c
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/wmadec.c	Wed Aug 27 23:44:34 2008 +0000
+++ b/wmadec.c	Thu Aug 28 00:46:09 2008 +0000
@@ -689,18 +689,12 @@
         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 */