From 37bed6ff3f7f48e25d1e0c3efdf8cbb90bcf9514 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Tue, 31 Jan 2012 15:54:21 -0800
Subject: aacdec: Try to sniff a reasonable channel layout for PCE based
 configurations.

This changes the output order of multichannel PCE based streams.
---
 libavcodec/aac.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libavcodec/aac.h')

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index a36080cb6f..49def78979 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -263,9 +263,8 @@ typedef struct {
      * @name Channel element related data
      * @{
      */
-    enum ChannelPosition che_pos[4][MAX_ELEM_ID]; /**< channel element channel mapping with the
-                                                   *   first index as the first 4 raw data block types
-                                                   */
+    uint8_t layout_map[MAX_ELEM_ID*4][3];
+    int layout_map_tags;
     ChannelElement          *che[4][MAX_ELEM_ID];
     ChannelElement  *tag_che_map[4][MAX_ELEM_ID];
     int tags_mapped;
-- 
cgit v1.2.3