aacenc: Don't set s->cur_channel before apply_window_and_mdct().
authorAlex Converse <alex.converse@gmail.com>
Tue, 31 Aug 2010 00:31:17 +0000 (00:31 +0000)
committerAlex Converse <alex.converse@gmail.com>
Tue, 31 Aug 2010 00:31:17 +0000 (00:31 +0000)
In general s->cur_channel should be phased out.

Originally committed as revision 25001 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/aacenc.c

index 0c911b8f6355fe72705ab734129d5f32163ac2c1..c0e3c3523ef2857436edc59e7290eee87f756de9 100644 (file)
@@ -544,7 +544,6 @@ static int aac_encode_frame(AVCodecContext *avctx,
             for (k = 0; k < ics->num_windows; k++)
                 ics->group_len[k] = wi[j].grouping[k];
 
-            s->cur_channel = cur_channel;
             apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2);
         }
         start_ch += chans;