[FFmpeg-cvslog] r24998 - trunk/libavcodec/aacenc.c

[alexc]

Author: alexc
Date: Tue Aug 31 01:43:03 2010
New Revision: 24998

Log:
aacenc: Only apply M/S if common_window is set.

Modified:
   trunk/libavcodec/aacenc.c

Modified: trunk/libavcodec/aacenc.c
==============================================================================
--- trunk/libavcodec/aacenc.c	Tue Aug 31 01:16:35 2010	(r24997)
+++ trunk/libavcodec/aacenc.c	Tue Aug 31 01:43:03 2010	(r24998)
@@ -313,7 +313,7 @@ static void adjust_frame_information(AAC
             for (g = 0; g < ics->num_swb; g++) {
                 sum = 0;
                 //apply M/S
-                if (!ch && cpe->ms_mask[w + g]) {
+                if (cpe->common_window && !ch && cpe->ms_mask[w + g]) {
                     for (i = 0; i < ics->swb_sizes[g]; i++) {
                         cpe->ch[0].coeffs[start+i] = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0;
                         cpe->ch[1].coeffs[start+i] =  cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i];