Commit 99d7a3e8 authored by Alex Converse's avatar Alex Converse

aacenc: Remove an unused variable from adjust_frame_information().

Originally committed as revision 25002 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1297f581
...@@ -302,7 +302,7 @@ static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe) ...@@ -302,7 +302,7 @@ static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe)
static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans) static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans)
{ {
int i, w, w2, g, ch; int i, w, w2, g, ch;
int start, sum, maxsfb, cmaxsfb; int start, maxsfb, cmaxsfb;
for (ch = 0; ch < chans; ch++) { for (ch = 0; ch < chans; ch++) {
IndividualChannelStream *ics = &cpe->ch[ch].ics; IndividualChannelStream *ics = &cpe->ch[ch].ics;
...@@ -311,7 +311,6 @@ static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, in ...@@ -311,7 +311,6 @@ static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, in
cpe->ch[ch].pulse.num_pulse = 0; cpe->ch[ch].pulse.num_pulse = 0;
for (w = 0; w < ics->num_windows*16; w += 16) { for (w = 0; w < ics->num_windows*16; w += 16) {
for (g = 0; g < ics->num_swb; g++) { for (g = 0; g < ics->num_swb; g++) {
sum = 0;
//apply M/S //apply M/S
if (cpe->common_window && !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++) { for (i = 0; i < ics->swb_sizes[g]; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment