diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-08-30 23:43:03 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-08-30 23:43:03 +0000 |
| commit | 76dfe4ebc5c173dcbf75a09d0a2229803d7ae4ab (patch) | |
| tree | 6d55fbec55181f002ee41694369d642d7174319c /libavcodec | |
| parent | 4ca31edcfe1ac6b8d48353436fefd1549161cd83 (diff) | |
| download | ffmpeg-76dfe4ebc5c173dcbf75a09d0a2229803d7ae4ab.tar.gz | |
aacenc: Only apply M/S if common_window is set.
Originally committed as revision 24998 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 0fa33e87b1..3985204b96 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -313,7 +313,7 @@ static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, in 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]; |