Commit 2309923c authored by Robert Swain's avatar Robert Swain

Reindent after last commit

Originally committed as revision 20068 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e22da6b6
...@@ -190,30 +190,30 @@ static int output_configure(AACContext *ac, ...@@ -190,30 +190,30 @@ static int output_configure(AACContext *ac,
avctx->channel_layout = aac_channel_layout[channel_config - 1]; avctx->channel_layout = aac_channel_layout[channel_config - 1];
} else { } else {
/* Allocate or free elements depending on if they are in the /* Allocate or free elements depending on if they are in the
* current program configuration. * current program configuration.
* *
* Set up default 1:1 output mapping. * Set up default 1:1 output mapping.
* *
* For a 5.1 stream the output order will be: * For a 5.1 stream the output order will be:
* [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ] * [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ]
*/ */
for (i = 0; i < MAX_ELEM_ID; i++) { for (i = 0; i < MAX_ELEM_ID; i++) {
for (type = 0; type < 4; type++) { for (type = 0; type < 4; type++) {
if (che_pos[type][i]) { if (che_pos[type][i]) {
if (!ac->che[type][i] && !(ac->che[type][i] = av_mallocz(sizeof(ChannelElement)))) if (!ac->che[type][i] && !(ac->che[type][i] = av_mallocz(sizeof(ChannelElement))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (type != TYPE_CCE) { if (type != TYPE_CCE) {
ac->output_data[channels++] = ac->che[type][i]->ch[0].ret; ac->output_data[channels++] = ac->che[type][i]->ch[0].ret;
if (type == TYPE_CPE) { if (type == TYPE_CPE) {
ac->output_data[channels++] = ac->che[type][i]->ch[1].ret; ac->output_data[channels++] = ac->che[type][i]->ch[1].ret;
}
} }
} } else
} else av_freep(&ac->che[type][i]);
av_freep(&ac->che[type][i]); }
} }
}
memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
ac->tags_mapped = 4 * MAX_ELEM_ID; ac->tags_mapped = 4 * MAX_ELEM_ID;
......
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