From aa0f84df5a9386ba7c83669a7b999a2fd9ca4998 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 18 Apr 2012 09:37:38 +0200
Subject: [PATCH] aacdec: disable new chan_config guessing code from libav.
It causes more problems than it solves.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/aacdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6e6c4d7fb64..fd2e4a21983 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -483,7 +483,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
ac->oc[1].m4ac.chan_config = 2;
}
// And vice-versa
- if (!ac->tags_mapped && type == TYPE_SCE && ac->oc[1].m4ac.chan_config == 2) {
+ if (!ac->tags_mapped && type == TYPE_SCE && ac->oc[1].m4ac.chan_config == 2 && 0) {
uint8_t layout_map[MAX_ELEM_ID*4][3];
int layout_map_tags;
push_output_configuration(ac);
--
GitLab