From 7eacd70feac49656d70fce677f4d7b42279338da Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Fri, 20 Apr 2012 14:01:57 -0700
Subject: [PATCH] aac: Handle HE-AACv2 when sniffing a channel order.

---
 libavcodec/aacdec.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 7cf21954c9..bd5ba00373 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -404,6 +404,13 @@ static int output_configure(AACContext *ac,
         if (ret < 0)
             return ret;
     }
+    if (ac->oc[1].m4ac.ps == 1 && channels == 2) {
+        if (layout == AV_CH_FRONT_CENTER) {
+            layout = AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT;
+        } else {
+            layout = 0;
+        }
+    }
 
     memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
     avctx->channel_layout = ac->oc[1].channel_layout = layout;