summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-18 09:37:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-18 09:37:38 +0200
commitaa0f84df5a9386ba7c83669a7b999a2fd9ca4998 (patch)
treea29373f154d803be6c6e7f5194aec738d4e623c4
parentdbe29db8cb09fb39bd8dc5b25934e92279d0aa8d (diff)
downloadffmpeg-streaming-aa0f84df5a9386ba7c83669a7b999a2fd9ca4998.zip
ffmpeg-streaming-aa0f84df5a9386ba7c83669a7b999a2fd9ca4998.tar.gz
aacdec: disable new chan_config guessing code from libav.
It causes more problems than it solves. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/aacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6e6c4d7..fd2e4a2 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);
OpenPOWER on IntegriCloud