aacdec: disable new chan_config guessing code from libav.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Apr 2012 07:37:38 +0000 (09:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Apr 2012 07:37:38 +0000 (09:37 +0200)
It causes more problems than it solves.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c

index 6e6c4d7..fd2e4a2 100644 (file)
@@ -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);