aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@gmail.com>2009-09-28 15:35:51 +0000
committerRobert Swain <robert.swain@gmail.com>2009-09-28 15:35:51 +0000
commit2309923c5c3dbc4c1e92a3a56320d77825429458 (patch)
tree9b9db1a1f6244c6f582943587e3fff60fc6aa74c /libavcodec
parente22da6b63704c85e7da71866db2837c7c73a144a (diff)
downloadffmpeg-2309923c5c3dbc4c1e92a3a56320d77825429458.tar.gz
Reindent after last commit
Originally committed as revision 20068 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index c659436a88..468bbcd3b9 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -190,30 +190,30 @@ static int output_configure(AACContext *ac,
avctx->channel_layout = aac_channel_layout[channel_config - 1];
} else {
- /* Allocate or free elements depending on if they are in the
- * current program configuration.
- *
- * Set up default 1:1 output mapping.
- *
- * For a 5.1 stream the output order will be:
- * [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ]
- */
+ /* Allocate or free elements depending on if they are in the
+ * current program configuration.
+ *
+ * Set up default 1:1 output mapping.
+ *
+ * For a 5.1 stream the output order will be:
+ * [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ]
+ */
- for (i = 0; i < MAX_ELEM_ID; i++) {
- for (type = 0; type < 4; type++) {
- if (che_pos[type][i]) {
- if (!ac->che[type][i] && !(ac->che[type][i] = av_mallocz(sizeof(ChannelElement))))
- return AVERROR(ENOMEM);
- if (type != TYPE_CCE) {
- ac->output_data[channels++] = ac->che[type][i]->ch[0].ret;
- if (type == TYPE_CPE) {
- ac->output_data[channels++] = ac->che[type][i]->ch[1].ret;
+ for (i = 0; i < MAX_ELEM_ID; i++) {
+ for (type = 0; type < 4; type++) {
+ if (che_pos[type][i]) {
+ if (!ac->che[type][i] && !(ac->che[type][i] = av_mallocz(sizeof(ChannelElement))))
+ return AVERROR(ENOMEM);
+ if (type != TYPE_CCE) {
+ ac->output_data[channels++] = ac->che[type][i]->ch[0].ret;
+ if (type == TYPE_CPE) {
+ ac->output_data[channels++] = ac->che[type][i]->ch[1].ret;
+ }
}
- }
- } else
- av_freep(&ac->che[type][i]);
+ } else
+ av_freep(&ac->che[type][i]);
+ }
}
- }
memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
ac->tags_mapped = 4 * MAX_ELEM_ID;